From 21c4400278edffb24c71c0d2483b4d76c0aa6dbb Mon Sep 17 00:00:00 2001
From: Rhys Perry <pendingchaos02@gmail.com>
Date: Mon, 30 Jun 2025 14:25:17 +0100
Subject: [PATCH] aco: update ctx.block when inserting discard block

Signed-off-by: Rhys Perry <pendingchaos02@gmail.com>
Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13432
Backport-to: 25.1
Reviewed-by: Georg Lehmann <dadschoorse@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35833>
---
 src/amd/compiler/aco_lower_to_hw_instr.cpp | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/amd/compiler/aco_lower_to_hw_instr.cpp b/src/amd/compiler/aco_lower_to_hw_instr.cpp
index cdfb75892df..12f582be833 100644
--- a/src/amd/compiler/aco_lower_to_hw_instr.cpp
+++ b/src/amd/compiler/aco_lower_to_hw_instr.cpp
@@ -2427,6 +2427,7 @@ lower_to_hw_instr(Program* program)
                      discard_exit_block = discard_block;
                   }
                   block = &program->blocks[block_idx];
+                  ctx.block = block;
 
                   /* sendmsg(dealloc_vgprs) releases scratch, so it isn't safe if there is an
                    * in-progress scratch store. */