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

mesa/st/sampler_view: use a local variable for buffer sv format

Browse source 
Reviewed-by: Timothy Arceri <tarceri@itsqueeze.com>
(cherry picked from commit 8fce32191e)

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40488>
This commit is contained in:
Mike Blumenkrantz 2026-03-11 12:16:40 -04:00 • committed by Eric Engestrom
parent 56b5152152
commit 6026a01827
2 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1004,7 +1004,7 @@
"description": "mesa/st/sampler_view: use a local variable for buffer sv format",
"nominated": false,
"nomination_type": 0,
"resolution": 4,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

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

@ -590,6 +590,7 @@ st_get_buffer_sampler_view_from_stobj(struct st_context *st,
if (!stBuf || !stBuf->buffer)
return NULL;
enum pipe_format format = st_mesa_format_to_pipe_format(st, texObj->_BufferObjectFormat);
sv = st_texture_get_current_sampler_view(st, texObj);
struct pipe_resource *buf = stBuf->buffer;
@ -601,9 +602,7 @@ st_get_buffer_sampler_view_from_stobj(struct st_context *st,
/* Debug check: make sure that the sampler view's parameters are
* what they're supposed to be.
*/
assert(st_mesa_format_to_pipe_format(st,
texObj->_BufferObjectFormat)
== view->format);
assert(format == view->format);
assert(view->target == PIPE_BUFFER);
ASSERTED unsigned base = texObj->BufferOffset;
ASSERTED unsigned size = MIN2(buf->width0 - base,
@ -630,8 +629,7 @@ st_get_buffer_sampler_view_from_stobj(struct st_context *st,
struct pipe_sampler_view templ;
templ.is_tex2d_from_buf = false;
templ.format =
st_mesa_format_to_pipe_format(st, texObj->_BufferObjectFormat);
templ.format = format;
templ.target = PIPE_BUFFER;
templ.swizzle_r = PIPE_SWIZZLE_X;
templ.swizzle_g = PIPE_SWIZZLE_Y;