From 70a2ede112acb589ee4310a0b3f7476fc1629b51 Mon Sep 17 00:00:00 2001 From: Brian Paul Date: Wed, 6 Mar 2019 16:15:19 -0700 Subject: [PATCH] st/mesa: rename st_texture_release_sampler_view() To st_texture_release_context_sampler_view() to be more clear that it's context-specific. Reviewed-by: Neha Bhende --- 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 f30afee75db..289827927e1 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 b22aa20d0a1..17c209c867f 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 47c100df647..d7a4c0d8d60 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, -- 2.30.2