From: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Date: Mon, 14 Aug 2023 12:57:58 +0000 (-0400)
Subject: asahi: Do not reference nir_dest
X-Git-Tag: upstream/23.3.3~3353
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=02ddb7eae2788f9a0e7488dcc9051c6c2d636c99;p=platform%2Fupstream%2Fmesa.git

asahi: Do not reference nir_dest

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
Acked-by: Faith Ekstrand <faith.ekstrand@collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/24674>
---

diff --git a/src/gallium/drivers/asahi/agx_nir_lower_sysvals.c b/src/gallium/drivers/asahi/agx_nir_lower_sysvals.c
index 75c2cc2..5b3814c 100644
--- a/src/gallium/drivers/asahi/agx_nir_lower_sysvals.c
+++ b/src/gallium/drivers/asahi/agx_nir_lower_sysvals.c
@@ -137,16 +137,16 @@ static bool
 lower_sysvals(nir_builder *b, nir_instr *instr, void *data)
 {
    b->cursor = nir_before_instr(instr);
-   nir_dest *dest;
+   nir_def *old;
    nir_def *replacement = NULL;
 
    if (instr->type == nir_instr_type_intrinsic) {
       nir_intrinsic_instr *intr = nir_instr_as_intrinsic(instr);
-      dest = &intr->dest;
+      old = &intr->dest.ssa;
       replacement = lower_intrinsic(b, intr);
    } else if (instr->type == nir_instr_type_tex) {
       nir_tex_instr *tex = nir_instr_as_tex(instr);
-      dest = &tex->dest;
+      old = &tex->dest.ssa;
 
       if (tex->op != nir_texop_lod_bias_agx)
          return false;
@@ -165,7 +165,7 @@ lower_sysvals(nir_builder *b, nir_instr *instr, void *data)
    }
 
    if (replacement != NULL) {
-      nir_def_rewrite_uses(&dest->ssa, replacement);
+      nir_def_rewrite_uses(old, replacement);
       return true;
    } else {
       return false;