Mesa (master): v3d/compiler: fix image size for 1D arrays

[GitLab Mirror]

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

Author: Iago Toral Quiroga <itoral at igalia.com>
Date:   Tue Jun 30 10:59:47 2020 +0200

v3d/compiler: fix image size for 1D arrays

Reviewed by: Alejandro Piñeiro <apinheiro at igalia.com>

Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/5692>

---

 src/broadcom/compiler/nir_to_vir.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/broadcom/compiler/nir_to_vir.c b/src/broadcom/compiler/nir_to_vir.c
index 1092c6b41da..2b641240d53 100644
--- a/src/broadcom/compiler/nir_to_vir.c
+++ b/src/broadcom/compiler/nir_to_vir.c
@@ -1762,7 +1762,10 @@ ntq_emit_image_size(struct v3d_compile *c, nir_intrinsic_instr *instr)
                        vir_uniform(c, QUNIFORM_IMAGE_WIDTH, image_index));
         if (instr->num_components > 1) {
                 ntq_store_dest(c, &instr->dest, 1,
-                               vir_uniform(c, QUNIFORM_IMAGE_HEIGHT,
+                               vir_uniform(c,
+                                           instr->num_components == 2 && is_array ?
+                                                   QUNIFORM_IMAGE_ARRAY_SIZE :
+                                                   QUNIFORM_IMAGE_HEIGHT,
                                            image_index));
         }
         if (instr->num_components > 2) {