OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa/st: move texture APIs to direct st calls

Browse Source 
This is a bit more spreadout, but is still pretty straightforward

Acked-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14100>
This commit is contained in:
Dave Airlie
2021-12-07 10:51:49 +10:00
committed by Marge Bot
parent 2d912b5caa
commit 889ac0f1b9
25 changed files with 422 additions and 658 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/mesa/main/texturebindless.c
View File

@@ -35,6 +35,8 @@
#include "util/hash_table.h"
#include "util/u_memory.h"
#include "state_tracker/st_cb_texture.h"
/**
* Return the gl_texture_handle_object for a given 64-bit handle.
*/
@@ -77,7 +79,7 @@ delete_texture_handle(struct gl_context *ctx, GLuint64 id)
_mesa_hash_table_u64_remove(ctx->Shared->TextureHandles, id);
mtx_unlock(&ctx->Shared->HandlesMutex);
ctx->Driver.DeleteTextureHandle(ctx, id);
st_DeleteTextureHandle(ctx, id);
}
/**
@@ -90,7 +92,7 @@ delete_image_handle(struct gl_context *ctx, GLuint64 id)
_mesa_hash_table_u64_remove(ctx->Shared->ImageHandles, id);
mtx_unlock(&ctx->Shared->HandlesMutex);
ctx->Driver.DeleteImageHandle(ctx, id);
st_DeleteImageHandle(ctx, id);
}
/**
@@ -131,7 +133,7 @@ make_texture_handle_resident(struct gl_context *ctx,
_mesa_hash_table_u64_insert(ctx->ResidentTextureHandles, handle,
texHandleObj);
ctx->Driver.MakeTextureHandleResident(ctx, handle, GL_TRUE);
st_MakeTextureHandleResident(ctx, handle, GL_TRUE);
/* Reference the texture object (and the separate sampler if needed) to
* be sure it won't be deleted until it is not bound anywhere and there
@@ -145,7 +147,7 @@ make_texture_handle_resident(struct gl_context *ctx,
_mesa_hash_table_u64_remove(ctx->ResidentTextureHandles, handle);
ctx->Driver.MakeTextureHandleResident(ctx, handle, GL_FALSE);
st_MakeTextureHandleResident(ctx, handle, GL_FALSE);
/* Unreference the texture object but keep the pointer intact, if
* refcount hits zero, the texture and all handles will be deleted.
@@ -180,7 +182,7 @@ make_image_handle_resident(struct gl_context *ctx,
_mesa_hash_table_u64_insert(ctx->ResidentImageHandles, handle,
imgHandleObj);
ctx->Driver.MakeImageHandleResident(ctx, handle, access, GL_TRUE);
st_MakeImageHandleResident(ctx, handle, access, GL_TRUE);
/* Reference the texture object to be sure it won't be deleted until it
* is not bound anywhere and there are no handles using the object that
@@ -192,7 +194,7 @@ make_image_handle_resident(struct gl_context *ctx,
_mesa_hash_table_u64_remove(ctx->ResidentImageHandles, handle);
ctx->Driver.MakeImageHandleResident(ctx, handle, access, GL_FALSE);
st_MakeImageHandleResident(ctx, handle, access, GL_FALSE);
/* Unreference the texture object but keep the pointer intact, if
* refcount hits zero, the texture and all handles will be deleted.
@@ -237,7 +239,7 @@ get_texture_handle(struct gl_context *ctx, struct gl_texture_object *texObj,
}
/* Request a new texture handle from the driver. */
handle = ctx->Driver.NewTextureHandle(ctx, texObj, sampObj);
handle = st_NewTextureHandle(ctx, texObj, sampObj);
if (!handle) {
mtx_unlock(&ctx->Shared->HandlesMutex);
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glGetTexture*HandleARB()");
@@ -332,7 +334,7 @@ get_image_handle(struct gl_context *ctx, struct gl_texture_object *texObj,
}
/* Request a new image handle from the driver. */
handle = ctx->Driver.NewImageHandle(ctx, &imgObj);
handle = st_NewImageHandle(ctx, &imgObj);
if (!handle) {
mtx_unlock(&ctx->Shared->HandlesMutex);
_mesa_error(ctx, GL_OUT_OF_MEMORY, "glGetImageHandleARB()");