From 88792b9ea3f1df2d68a9229b0aac54ca1ac993dd Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Fri, 15 Mar 2024 13:18:01 -0400
Subject: [PATCH] zink: update xfb info after lower_to_scalar

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28466>
---
 src/gallium/drivers/zink/zink_compiler.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/zink/zink_compiler.c b/src/gallium/drivers/zink/zink_compiler.c
index 441141524dc..0a3451f69c4 100644
--- a/src/gallium/drivers/zink/zink_compiler.c
+++ b/src/gallium/drivers/zink/zink_compiler.c
@@ -5510,8 +5510,9 @@ zink_shader_create(struct zink_screen *screen, struct nir_shader *nir)
          break;
       }
    }
-   nir_gather_xfb_info_from_intrinsics(nir);
    NIR_PASS_V(nir, nir_lower_io_to_scalar, nir_var_shader_in | nir_var_shader_out, eliminate_io_wrmasks_instr, nir);
+   if (nir->info.stage < MESA_SHADER_FRAGMENT)
+      nir_gather_xfb_info_from_intrinsics(nir);
    /* clean up io to improve direct access */
    optimize_nir(nir, NULL, true);
    rework_io_vars(nir, nir_var_shader_in);