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

st/mesa: Clear texture's views when texture is removed from Shared->TexObjects

Browse Source 
If texture is shared between several contexts, calling glDeleteTextures
will remove it from ctx->Shared->TexObjects - which makes impossible for
contexts, when destroyed, to release their views to this texture. Which
leaves dangling pointers to destroyed contexts.

Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/2960
Signed-off-by: Danylo Piliaiev <danylo.piliaiev@globallogic.com>
Reviewed-by: Tapani Pälli <tapani.palli@intel.com>
Reviewed-by: Marek Olšák <marek.olsak@amd.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5106>
This commit is contained in:
Danylo Piliaiev
2020-05-18 20:44:58 +03:00
committed by Marge Bot
parent a51ab5f956
commit 045267d1e6
4 changed files with 28 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/mesa/main/dd.h
View File

@@ -371,6 +371,12 @@ struct dd_function_table {
void (*DeleteTexture)(struct gl_context *ctx,
struct gl_texture_object *texObj);
/**
* Called to notify that texture is removed from ctx->Shared->TexObjects
*/
void (*TextureRemovedFromShared)(struct gl_context *ctx,
struct gl_texture_object *texObj);
/** Called to allocate a new texture image object. */
struct gl_texture_image * (*NewTextureImage)(struct gl_context *ctx);

4
src/mesa/main/texobj.c
View File

@@ -1514,6 +1514,10 @@ delete_textures(struct gl_context *ctx, GLsizei n, const GLuint *textures)
*/
_mesa_HashRemove(ctx->Shared->TexObjects, delObj->Name);
if (ctx->Driver.TextureRemovedFromShared) {
ctx->Driver.TextureRemovedFromShared(ctx, delObj);
}
/* Unreference the texobj. If refcount hits zero, the texture
* will be deleted.
*/

17
src/mesa/state_tracker/st_cb_texture.c
View File

@@ -195,6 +195,22 @@ st_DeleteTextureObject(struct gl_context *ctx,
_mesa_delete_texture_object(ctx, texObj);
}
/**
* Called via ctx->Driver.TextureRemovedFromShared()
* When texture is removed from ctx->Shared->TexObjects we lose
* the ability to clean up views on context destruction, which may
* lead to dangling pointers to destroyed contexts.
* Release the views to prevent this.
*/
static void
st_TextureReleaseAllSamplerViews(struct gl_context *ctx,
struct gl_texture_object *texObj)
{
struct st_context *st = st_context(ctx);
struct st_texture_object *stObj = st_texture_object(texObj);
st_texture_release_all_sampler_views(st, stObj);
}
/** called via ctx->Driver.FreeTextureImageBuffer() */
static void
@@ -3355,6 +3371,7 @@ st_init_texture_functions(struct dd_function_table *functions)
functions->NewTextureImage = st_NewTextureImage;
functions->DeleteTextureImage = st_DeleteTextureImage;
functions->DeleteTexture = st_DeleteTextureObject;
functions->TextureRemovedFromShared = st_TextureReleaseAllSamplerViews;
functions->AllocTextureImageBuffer = st_AllocTextureImageBuffer;
functions->FreeTextureImageBuffer = st_FreeTextureImageBuffer;
functions->MapTextureImage = st_MapTextureImage;

2
src/mesa/state_tracker/st_sampler_view.c
View File

@@ -226,7 +226,7 @@ st_texture_release_all_sampler_views(struct st_context *st,
for (unsigned i = 0; i < views->count; ++i) {
struct st_sampler_view *stsv = &views->views[i];
if (stsv->view) {
if (stsv->st != st) {
if (stsv->st && stsv->st != st) {
/* Transfer this reference to the zombie list. It will
* likely be freed when the zombie list is freed.
*/