Mesa (main): ir3/merge_regs: Set wrmask for pcopy destinations

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 4b0eba9cb16dc9180bcf8e770bbd38a0773d1274
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=4b0eba9cb16dc9180bcf8e770bbd38a0773d1274

Author: Connor Abbott <cwabbott0 at gmail.com>
Date:   Fri Jul 23 11:47:49 2021 +0200

ir3/merge_regs: Set wrmask for pcopy destinations

This was wrong, and with spilling we can now create vector phi's in rare
circumstances.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12033>

---

 src/freedreno/ir3/ir3_merge_regs.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/freedreno/ir3/ir3_merge_regs.c b/src/freedreno/ir3/ir3_merge_regs.c
index e5ba1bdb59c..4231cbfc571 100644
--- a/src/freedreno/ir3/ir3_merge_regs.c
+++ b/src/freedreno/ir3/ir3_merge_regs.c
@@ -429,7 +429,8 @@ create_parallel_copy(struct ir3_block *block)
       for (j = 0; j < phi_count; j++) {
          struct ir3_register *reg = __ssa_dst(pcopy);
          reg->flags |= src[j]->flags & (IR3_REG_HALF | IR3_REG_ARRAY);
-         reg->size = reg_elems(src[j]);
+         reg->size = src[j]->size;
+         reg->wrmask = src[j]->wrmask;
       }
 
       for (j = 0; j < phi_count; j++) {