To st_texture_release_context_sampler_view() to be more clear that it's context-specific. --- src/mesa/state_tracker/st_context.c | 2 +- src/mesa/state_tracker/st_sampler_view.c | 4 ++-- src/mesa/state_tracker/st_sampler_view.h | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index f30afee..2898279 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -748,7 +748,7 @@ destroy_tex_sampler_cb(GLuint id, void *data, void *userData) struct gl_texture_object *texObj = (struct gl_texture_object *) data; struct st_context *st = (struct st_context *) userData; - st_texture_release_sampler_view(st, st_texture_object(texObj)); + st_texture_release_context_sampler_view(st, st_texture_object(texObj)); } diff --git a/src/mesa/state_tracker/st_sampler_view.c b/src/mesa/state_tracker/st_sampler_view.c index b22aa20..17c209c 100644 --- a/src/mesa/state_tracker/st_sampler_view.c +++ b/src/mesa/state_tracker/st_sampler_view.c @@ -185,8 +185,8 @@ st_texture_get_current_sampler_view(const struct st_context *st, * which belong to the context before the context is destroyed. */ void -st_texture_release_sampler_view(struct st_context *st, - struct st_texture_object *stObj) +st_texture_release_context_sampler_view(struct st_context *st, + struct st_texture_object *stObj) { GLuint i; diff --git a/src/mesa/state_tracker/st_sampler_view.h b/src/mesa/state_tracker/st_sampler_view.h index 47c100d..d7a4c0d 100644 --- a/src/mesa/state_tracker/st_sampler_view.h +++ b/src/mesa/state_tracker/st_sampler_view.h @@ -58,8 +58,8 @@ st_create_texture_sampler_view(struct pipe_context *pipe, extern void -st_texture_release_sampler_view(struct st_context *st, - struct st_texture_object *stObj); +st_texture_release_context_sampler_view(struct st_context *st, + struct st_texture_object *stObj); extern void st_texture_release_all_sampler_views(struct st_context *st, -- 1.8.5.6 _______________________________________________ mesa-dev mailing list mesa-dev@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/mesa-dev