diff --git a/.pick_status.json b/.pick_status.json
index 8090635d7f1..93f8ade829e 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -108,7 +108,7 @@
         "description": "util/stencil: fix stencil fallback blit shader texture types.",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "because_sha": "f05dfddeb1adad9f6d4ca18f5e066b3ae23d3e28"
     },
     {
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);