Mesa (master): nir: Handle image arrays when setting variable data

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 337f58438e6ac9dc66d3df25eabd8b89c883ad90
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=337f58438e6ac9dc66d3df25eabd8b89c883ad90

Author: Kenneth Graunke <kenneth at whitecape.org>
Date:   Mon Nov  4 17:14:10 2019 -0800

nir: Handle image arrays when setting variable data

Fixes a ton of regressions in image load store tests.

Fixes: 4319cc8c0f5 ("nir: pack nir_variable::data::xfb_*")
Acked-by: Alyssa Rosenzweig <alyssa.rosenzweig at collabora.com>

---

 src/compiler/glsl/glsl_to_nir.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp
index 2e6570e5d6c..9a82f97731a 100644
--- a/src/compiler/glsl/glsl_to_nir.cpp
+++ b/src/compiler/glsl/glsl_to_nir.cpp
@@ -600,7 +600,7 @@ nir_visitor::visit(ir_variable *ir)
    var->data.bindless = ir->data.bindless;
    var->data.offset = ir->data.offset;
 
-   if (var->type->is_image()) {
+   if (var->type->without_array()->is_image()) {
       var->data.image.access = (gl_access_qualifier)image_access;
       var->data.image.format = ir->data.image_format;
    } else {