Mesa (staging/22.1): zink: fix cubemap lowering for array samplers

[GitLab Mirror]

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

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

zink: fix cubemap lowering for array samplers

each sampler is 1 driver location, so use the base variable

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

fixes:
dEQP-GL45-ES31.functional.shaders.opaque_type_indexing.sampler.const_expression.*.samplercubearray

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

---

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

diff --git a/.pick_status.json b/.pick_status.json
index 20bbce5af14..575b9e08bd8 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -1111,7 +1111,7 @@
         "description": "zink: fix cubemap lowering for array samplers",
         "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 a9c2754df38..523ba186abd 100644
--- a/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c
+++ b/src/gallium/drivers/zink/zink_lower_cubemap_to_array.c
@@ -391,7 +391,9 @@ rewrite_cube_var_type(nir_builder *b, nir_tex_instr *tex)
    nir_foreach_variable_with_modes(var, b->shader, nir_var_uniform) {
       if (!glsl_type_is_sampler(glsl_without_array(var->type)))
          continue;
-      if (var->data.driver_location == index) {
+      unsigned size = glsl_type_is_array(var->type) ? glsl_get_length(var->type) : 1;
+      if (var->data.driver_location == index ||
+          (var->data.driver_location < index && var->data.driver_location + size > index)) {
          sampler = var;
          break;
       }