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

util/stencil: fix stencil fallback blit shader texture types.

Browse source 
src/gallium/auxiliary/tgsi/tgsi_scan.c:287: scan_src_operand: Assertion `info->sampler_targets[index] == target' failed.
assert was being triggered by
GTF-GL46.gtf30.GL3Tests.framebuffer_blit.framebuffer_blit_functionality_multisampled_to_singlesampled_blit
using the stencil fallback with zink.

Fixes: f05dfddeb1 ("u_blitter: fix stencil blit fallback for crocus.")
Acked-by: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16069>
(cherry picked from commit 4b7ba3869b)
This commit is contained in:
Dave Airlie 2022-04-21 10:23:11 +10:00 • committed by Dylan Baker
parent 55d9bd1b64
commit f8dc7e0d37
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -121,7 +121,7 @@
"description": "util/stencil: fix stencil fallback blit shader texture types.",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": "f05dfddeb1adad9f6d4ca18f5e066b3ae23d3e28"
},

4
src/gallium/auxiliary/util/u_simple_shaders.c
View file

@ -1189,7 +1189,7 @@ util_make_fs_stencil_blit(struct pipe_context *pipe, bool msaa_src)
"FRAG\n"
"DCL IN[0], GENERIC[0], LINEAR\n"
"DCL SAMP[0]\n"
"DCL SVIEW[0], 2D, UINT\n"
"DCL SVIEW[0], %s, UINT\n"
"DCL CONST[0][0]\n"
"DCL TEMP[0]\n"
@ -1208,7 +1208,7 @@ util_make_fs_stencil_blit(struct pipe_context *pipe, bool msaa_src)
enum tgsi_texture_type tgsi_tex = msaa_src ? TGSI_TEXTURE_2D_MSAA :
TGSI_TEXTURE_2D;
sprintf(text, shader_templ, tgsi_texture_names[tgsi_tex]);
sprintf(text, shader_templ, tgsi_texture_names[tgsi_tex], tgsi_texture_names[tgsi_tex]);
if (!tgsi_text_translate(text, tokens, ARRAY_SIZE(tokens))) {
assert(0);