From 083a557856791f3e894c7d1b93b9fc33a265f248 Mon Sep 17 00:00:00 2001
From: Rhys Perry <pendingchaos02@gmail.com>
Date: Wed, 22 Jan 2025 14:02:58 +0000
Subject: [PATCH] d3d12: fix phi handling in d3d12_lower_primitive_id

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/32005>
---
 src/gallium/drivers/d3d12/d3d12_nir_passes.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/gallium/drivers/d3d12/d3d12_nir_passes.c b/src/gallium/drivers/d3d12/d3d12_nir_passes.c
index c71daee36c0..6fc1158dcad 100644
--- a/src/gallium/drivers/d3d12/d3d12_nir_passes.c
+++ b/src/gallium/drivers/d3d12/d3d12_nir_passes.c
@@ -609,7 +609,7 @@ d3d12_lower_primitive_id(nir_shader *shader)
    primitive_id_var->data.interpolation = INTERP_MODE_FLAT;
 
    nir_foreach_block(block, impl) {
-      b.cursor = nir_before_block(block);
+      b.cursor = nir_before_block_after_phis(block);
       primitive_id = nir_load_primitive_id(&b);
 
       nir_foreach_instr_safe(instr, block) {