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@collabora.com>

diff --git a/src/compiler/glsl/glsl_to_nir.cpp b/src/compiler/glsl/glsl_to_nir.cpp
index 2e6570e5d6c67c434210bf8ed934a73bd974dcb4..9a82f97731a9a900a2f4bb4cad2b3c20d05a425d 100644 (file)
--- 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 {