Mesa (13.0): st/glsl_to_tgsi: fix block copies of arrays of structs

[Emil Velikov]

Module: Mesa
Branch: 13.0
Commit: 8f807e914f8c7f30f8d57e1829d4cb0bd8836a21
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=8f807e914f8c7f30f8d57e1829d4cb0bd8836a21

Author: Nicolai Hähnle <nicolai.haehnle at amd.com>
Date:   Sun Oct 16 17:34:33 2016 +0200

st/glsl_to_tgsi: fix block copies of arrays of structs

Use a full writemask in this case. This is relevant e.g. when a function
has an inout argument which is an array of structs.

v2: use C-style comment (Timothy Arceri)

Reviewed-by: Marek Olšák <marek.olsak at amd.com> (v1)
Cc: 13.0 <mesa-stable at lists.freedesktop.org>
(cherry picked from commit a1895685f8f341e7facf3c5705bdee99860e3082)

---

 src/mesa/state_tracker/st_glsl_to_tgsi.cpp | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
index 562587e..854decc 100644
--- a/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
+++ b/src/mesa/state_tracker/st_glsl_to_tgsi.cpp
@@ -2941,10 +2941,12 @@ glsl_to_tgsi_visitor::visit(ir_assignment *ir)
       } else if (ir->write_mask == 0) {
          assert(!ir->lhs->type->is_scalar() && !ir->lhs->type->is_vector());
 
-         if (ir->lhs->type->is_array() || ir->lhs->type->is_matrix()) {
-            unsigned num_elements = ir->lhs->type->without_array()->vector_elements;
+         unsigned num_elements = ir->lhs->type->without_array()->vector_elements;
+
+         if (num_elements) {
             l.writemask = u_bit_consecutive(0, num_elements);
          } else {
+            /* The type is a struct or an array of (array of) structs. */
             l.writemask = WRITEMASK_XYZW;
          }
       } else {