Mesa (staging/19.2): tgsi_to_nir: fix masked out image loads

[GitLab Mirror]

Module: Mesa
Branch: staging/19.2
Commit: 2353a63a584623e968b52cef38715231b4102757
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=2353a63a584623e968b52cef38715231b4102757

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Wed Sep 18 17:34:13 2019 -0400

tgsi_to_nir: fix masked out image loads

This caused a failure in NIR validation.

Reviewed-by: Connor Abbott <cwabbott0 at gmail.com>
Reviewed-by: Eric Anholt <eric at anholt.net>
(cherry picked from commit 3906fce88bb473f283e4b064cc996ea6aa6d2922)

---

 src/gallium/auxiliary/nir/tgsi_to_nir.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/gallium/auxiliary/nir/tgsi_to_nir.c b/src/gallium/auxiliary/nir/tgsi_to_nir.c
index 0e9c396d3a4..63e62f13266 100644
--- a/src/gallium/auxiliary/nir/tgsi_to_nir.c
+++ b/src/gallium/auxiliary/nir/tgsi_to_nir.c
@@ -1922,8 +1922,7 @@ ttn_mem(struct ttn_compile *c, nir_alu_dest dest, nir_ssa_def **src)
 
 
    if (tgsi_inst->Instruction.Opcode == TGSI_OPCODE_LOAD) {
-      nir_ssa_dest_init(&instr->instr, &instr->dest,
-                        util_last_bit(tgsi_inst->Dst[0].Register.WriteMask),
+      nir_ssa_dest_init(&instr->instr, &instr->dest, instr->num_components,
                         32, NULL);
       nir_builder_instr_insert(b, &instr->instr);
       ttn_move_dest(b, dest, &instr->dest.ssa);