fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 02:58:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

st/mesa: minor refactoring of texture/sampler delete code

Browse source 
Rename st_texture_free_sampler_views() to
st_delete_texture_sampler_views() to align with
st_DeleteTextureObject(), its only caller.

Move the call to st_texture_release_all_sampler_views() from
st_DeleteTextureObject() to st_delete_texture_sampler_views()
so all the sampler view clean-up code is in one place.

Reviewed-by: Neha Bhende <bhenden@vmware.com>
This commit is contained in:
Brian Paul 2019-03-06 16:20:55 -07:00
parent 70a2ede112
commit 187a527ed7
3 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mesa/state_tracker/st_cb_texture.c
View file

@ -187,8 +187,7 @@ st_DeleteTextureObject(struct gl_context *ctx,
struct st_texture_object *stObj = st_texture_object(texObj);
pipe_resource_reference(&stObj->pt, NULL);
st_texture_release_all_sampler_views(st, stObj);
st_texture_free_sampler_views(stObj);
st_delete_texture_sampler_views(st, stObj);
simple_mtx_destroy(&stObj->validate_mutex);
_mesa_delete_texture_object(ctx, texObj);
}

11
src/mesa/state_tracker/st_sampler_view.c
View file

@ -231,15 +231,20 @@ st_texture_release_all_sampler_views(struct st_context *st,
/*
* Free the texture's st_sampler_views objects. This should be called
* after st_texture_release_all_sampler_views().
* Delete the texture's sampler views and st_sampler_views containers.
* This is to be called just before a texture is deleted.
*/
void
st_texture_free_sampler_views(struct st_texture_object *stObj)
st_delete_texture_sampler_views(struct st_context *st,
struct st_texture_object *stObj)
{
st_texture_release_all_sampler_views(st, stObj);
/* Free the container of the current per-context sampler views */
free(stObj->sampler_views);
stObj->sampler_views = NULL;
/* Free old sampler view containers */
while (stObj->sampler_views_old) {
struct st_sampler_views *views = stObj->sampler_views_old;
stObj->sampler_views_old = views->next;

3
src/mesa/state_tracker/st_sampler_view.h
View file

@ -66,7 +66,8 @@ st_texture_release_all_sampler_views(struct st_context *st,
struct st_texture_object *stObj);
void
st_texture_free_sampler_views(struct st_texture_object *stObj);
st_delete_texture_sampler_views(struct st_context *st,
struct st_texture_object *stObj);
const struct st_sampler_view *
st_texture_get_current_sampler_view(const struct st_context *st,