From bc2edf14d8d8399320fbff83bddd26b6398684f0 Mon Sep 17 00:00:00 2001 From: Rhys Perry Date: Mon, 9 Jun 2025 11:56:46 +0100 Subject: [PATCH] ac/nir: run nir_lower_vars_to_ssa after nir_lower_task_shader nir_lower_task_shader does nir_lower_returns, so we need this if the launch_mesh_workgroups was in control flow. Signed-off-by: Rhys Perry Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/13326 Backport-to: 25.1 Reviewed-by: Georg Lehmann Part-of: --- src/amd/common/nir/ac_nir_lower_taskmesh_io_to_mem.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/amd/common/nir/ac_nir_lower_taskmesh_io_to_mem.c b/src/amd/common/nir/ac_nir_lower_taskmesh_io_to_mem.c index 0e7c8319dae..b9cde1bf218 100644 --- a/src/amd/common/nir/ac_nir_lower_taskmesh_io_to_mem.c +++ b/src/amd/common/nir/ac_nir_lower_taskmesh_io_to_mem.c @@ -289,6 +289,9 @@ ac_nir_lower_task_outputs_to_mem(nir_shader *shader, }; progress |= nir_lower_task_shader(shader, lower_ts_opt); + /* Needed after nir_lower_task_shader */ + progress |= nir_lower_vars_to_ssa(shader); + lower_tsms_io_state state = { .draw_entry_bytes = 16, .payload_entry_bytes = task_payload_entry_bytes,