KonstantinSeurer
/
mesa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

mesa/st: drop release all sampler views wrapper 

Reviewed-by: Kristian H. Kristensen <hoegsberg@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14632>
This commit is contained in:
Dave Airlie 2021-12-21 15:33:24 +10:00 committed by Marge Bot
parent 31d3e3ebeb
commit 0f8a3a7175
3 changed files with 2 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -49,6 +49,7 @@
#include "api_exec_decl.h"
#include "state_tracker/st_cb_texture.h"
#include "state_tracker/st_context.h"
#include "state_tracker/st_format.h"
#include "state_tracker/st_cb_flush.h"
#include "state_tracker/st_texture.h"
@ -1485,7 +1486,7 @@ delete_textures(struct gl_context *ctx, GLsizei n, const GLuint *textures)
*/
_mesa_HashRemove(ctx->Shared->TexObjects, delObj->Name);
st_TextureReleaseAllSamplerViews(ctx, delObj);
st_texture_release_all_sampler_views(st_context(ctx), delObj);
/* Unreference the texobj. If refcount hits zero, the texture
* will be deleted.

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

@ -386,21 +386,6 @@ st_pbo_get_dst_format(struct gl_context *ctx, enum pipe_texture_target target,
return dst_format;
}
/**
* 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.
*/
void
st_TextureReleaseAllSamplerViews(struct gl_context *ctx,
struct gl_texture_object *texObj)
{
struct st_context *st = st_context(ctx);
st_texture_release_all_sampler_views(st, texObj);
}
void
st_FreeTextureImageBuffer(struct gl_context *ctx,
struct gl_texture_image *texImage)

2
src/mesa/state_tracker/st_cb_texture.h
View File

@ -55,8 +55,6 @@ st_finalize_texture(struct gl_context *ctx,
struct gl_texture_object *tObj,
GLuint cubeMapFace);
void st_TextureReleaseAllSamplerViews(struct gl_context *ctx,
struct gl_texture_object *texObj);
void st_FreeTextureImageBuffer(struct gl_context *ctx,
struct gl_texture_image *texImage);
void st_MapTextureImage(struct gl_context *ctx,