From 70e10babeae7960abc6334cc98e76e9a11f3f617 Mon Sep 17 00:00:00 2001
From: Job Noorman <jnoorman@igalia.com>
Date: Mon, 17 Jun 2024 11:34:25 +0200
Subject: [PATCH] ir3: correctly set wrmask for reload.macro

We used to set it MASK(elems) which would break when not all elements
are contiguous (which could happen for tex instructions after dce).

Fixes: 613eaac7b53 ("ir3: Initial support for spilling non-shared registers")
Signed-off-by: Job Noorman <jnoorman@igalia.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/29497>
---
 src/freedreno/ir3/ir3_spill.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/freedreno/ir3/ir3_spill.c b/src/freedreno/ir3/ir3_spill.c
index 949eba3c2be..e8d24475561 100644
--- a/src/freedreno/ir3/ir3_spill.c
+++ b/src/freedreno/ir3/ir3_spill.c
@@ -939,7 +939,7 @@ reload(struct ra_spill_ctx *ctx, struct ir3_register *reg,
       dst->array.id = reg->array.id;
       dst->size = reg->size;
    } else {
-      dst->wrmask = MASK(elems);
+      dst->wrmask = reg->wrmask;
    }
 
    dst->merge_set = reg->merge_set;