From 9aeca4c8b1f5408abe07d31f3f04257a42f6a0e5 Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Wed, 11 Mar 2026 12:16:40 -0400 Subject: [PATCH] mesa/st/sampler_view: use a local variable for texture sv format Reviewed-by: Timothy Arceri (cherry picked from commit 64dd6bf8aaada64f519379aa76dd091acd3af16f) Part-of: --- .pick_status.json | 2 +- src/mesa/state_tracker/st_sampler_view.c | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.pick_status.json b/.pick_status.json index 71c8900a83b..4d2537b9f49 100644 --- a/.pick_status.json +++ b/.pick_status.json @@ -994,7 +994,7 @@ "description": "mesa/st/sampler_view: use a local variable for texture sv format", "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 96b03ed5cf9..448768093cc 100644 --- a/src/mesa/state_tracker/st_sampler_view.c +++ b/src/mesa/state_tracker/st_sampler_view.c @@ -535,6 +535,8 @@ st_get_texture_sampler_view_from_stobj(struct st_context *st, if (!ignore_srgb_decode && samp->Attrib.sRGBDecode == GL_SKIP_DECODE_EXT) srgb_skip_decode = true; + enum pipe_format format = st_get_sampler_view_format(st, texObj, + srgb_skip_decode); simple_mtx_lock(&texObj->validate_mutex); sv = st_texture_get_current_sampler_view(st, texObj); @@ -547,7 +549,7 @@ st_get_texture_sampler_view_from_stobj(struct st_context *st, struct pipe_sampler_view *view = sv->view; assert(texObj->pt == view->texture); assert(!check_sampler_swizzle(st, texObj, view, glsl130_or_later)); - assert(st_get_sampler_view_format(st, texObj, srgb_skip_decode) == view->format); + assert(format == view->format); assert(gl_target_to_pipe(texObj->Target) == view->target); assert(texObj->level_override >= 0 || texObj->Attrib.MinLevel + @@ -564,8 +566,6 @@ st_get_texture_sampler_view_from_stobj(struct st_context *st, } /* create new sampler view */ - enum pipe_format format = st_get_sampler_view_format(st, texObj, - srgb_skip_decode); struct pipe_sampler_view *view = st_create_texture_sampler_view_from_stobj(st, texObj, format, glsl130_or_later);