Mesa (staging/22.1): zink: fix cubemap lowering bit size

[GitLab Mirror]

Module: Mesa
Branch: staging/22.1
Commit: 058cccb2525ea8383ccaf22c5a6ffc04c6742b42
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=058cccb2525ea8383ccaf22c5a6ffc04c6742b42

Author: Mike Blumenkrantz <michael.blumenkrantz at gmail.com>
Date:   Sat Jun 11 10:59:59 2022 -0400

zink: fix cubemap lowering bit size

this isn't always 32

Fixes: 2d745904ca7 ("zink: add a gently mangled version of the d3d12 cubemap -> array compiler pass")

fixes:
dEQP-GL45-ES31.functional.program_uniform.by_pointer.render.struct_in_array.sampler2D_samplerCube_*

Reviewed-by: Adam Jackson <ajax at redhat.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17008>
(cherry picked from commit 87c7e757211b393f5b352ba346a927622c996abf)

---

 .pick_status.json                                      | 2 +-
 src/gallium/drivers/zink/zink_lower_cubemap_to_array.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pick_status.json b/.pick_status.json
index 575b9e08bd8..666cdce6898 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1102,7 +1102,7 @@
         "description": "zink: fix cubemap lowering bit size",
         "nominated": true,
         "nomination_type": 1,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "2d745904ca7022afdc86cb66e294cedfafa0fcb1"
     },
diff --git a/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c b/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c
index 523ba186abd..2141385ccf3 100644
--- a/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c
+++ b/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c
@@ -176,7 +176,7 @@ create_array_tex_from_cube_tex(nir_builder *b, nir_tex_instr *tex, nir_ssa_def *
    }
 
    nir_ssa_dest_init(&array_tex->instr, &array_tex->dest,
-                     nir_tex_instr_dest_size(array_tex), 32, NULL);
+                     nir_tex_instr_dest_size(array_tex), nir_dest_bit_size(tex->dest), NULL);
    nir_builder_instr_insert(b, &array_tex->instr);
    return &array_tex->dest.ssa;
 }