From a1895685f8f341e7facf3c5705bdee99860e3082 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Nicolai=20H=C3=A4hnle?= Date: Sun, 16 Oct 2016 17:34:33 +0200 Subject: [PATCH] st/glsl_to_tgsi: fix block copies of arrays of structs MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 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 (v1) Cc: 13.0 --- 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 562587ee58c..854decc39ac 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 { -- 2.30.2