nir/lower_images: fix for array of arrays

Signed-off-by: Karol Herbst <kherbst@redhat.com> Reviewed-by: Eric Anholt <eric@anholt.net> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5480>
2020-06-15 18:29:58 +02:00
parent e35e0307cb
commit 43faa9ebb1
1 changed files with 9 additions and 2 deletions
--- a/src/compiler/glsl/gl_nir_lower_images.c
+++ b/src/compiler/glsl/gl_nir_lower_images.c
@@ -39,8 +39,15 @@
 static void
 type_size_align_1(const struct glsl_type *type, unsigned *size, unsigned *align)
 {
-   *size = 1;
-   *align = 1;
+   unsigned s;
+
+   if (glsl_type_is_array(type))
+      s = glsl_get_aoa_size(type);
+   else
+      s = 1;
+
+   *size = s;
+   *align = s;
 }

 static bool