From 56b51521528ecd1d0424eb6a3afe7d8c36b3a1d9 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 11 Mar 2026 12:14:51 -0400 Subject: [PATCH] mesa/st: make st_texture_get_current_sampler_view static Reviewed-by: Timothy Arceri (cherry picked from commit 22ed7c823080ef4fa1d8b12819ad7106dabb66c7) Part-of: --- .pick_status.json | 2 +- src/mesa/state_tracker/st_sampler_view.c | 2 +- src/mesa/state_tracker/st_sampler_view.h | 4 ---- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index ad3c440d269..35d64a5b343 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -1014,7 +1014,7 @@ "description": "mesa/st: make st_texture_get_current_sampler_view static", "nominated": false, "nomination_type": 0, - "resolution": 4, + "resolution": 1, "main_sha": null, "because_sha": null, "notes": null diff --git a/src/mesa/state_tracker/st_sampler_view.c b/src/mesa/state_tracker/st_sampler_view.c index 3ff380d7a77..86068178b73 100644 --- a/src/mesa/state_tracker/st_sampler_view.c +++ b/src/mesa/state_tracker/st_sampler_view.c @@ -166,7 +166,7 @@ out: * * Performs no additional validation. */ -struct st_sampler_view * +static struct st_sampler_view * st_texture_get_current_sampler_view(const struct st_context *st, const struct gl_texture_object *stObj) { diff --git a/src/mesa/state_tracker/st_sampler_view.h b/src/mesa/state_tracker/st_sampler_view.h index 0f9d5f33b61..432da56061a 100644 --- a/src/mesa/state_tracker/st_sampler_view.h +++ b/src/mesa/state_tracker/st_sampler_view.h @@ -66,10 +66,6 @@ void st_delete_texture_sampler_views(struct st_context *st, struct gl_texture_object *stObj); -struct st_sampler_view * -st_texture_get_current_sampler_view(const struct st_context *st, - const struct gl_texture_object *stObj); - struct pipe_sampler_view * st_get_texture_sampler_view_from_stobj(struct st_context *st, struct gl_texture_object *stObj,