Mesa (main): util/stencil: fix stencil fallback blit shader texture types.

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 4b7ba3869be3f706efc717d40535c61d5c7a20c7
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b7ba3869be3f706efc717d40535c61d5c7a20c7

Author: Dave Airlie <airlied at redhat.com>
Date:   Thu Apr 21 10:23:11 2022 +1000

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

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: f05dfddeb1ad ("u_blitter: fix stencil blit fallback for crocus.")
Acked-by: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/16069>

---

 src/gallium/auxiliary/util/u_simple_shaders.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/util/u_simple_shaders.c b/src/gallium/auxiliary/util/u_simple_shaders.c
index f46b319789d..07c667b2184 100644
--- a/src/gallium/auxiliary/util/u_simple_shaders.c
+++ b/src/gallium/auxiliary/util/u_simple_shaders.c
@@ -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);