fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-06 20:18:12 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

nir/lower_shader_calls: Repair SSA after wrap_instrs

Browse source 
Wrapping jump instructions that are located inside ifs can break SSA
invariants because the else block no longer dominates the merge block.
Repair the SSA to make the validator happy again.

Cc: mesa-stable
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37957>
(cherry picked from commit 50e65dac79)
This commit is contained in:
Natalie Vock 2025-10-20 15:07:05 +02:00 • committed by Eric Engestrom
parent d098ab32ba
commit 27c1b2e790
2 changed files with 11 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.pick_status.json
View file

@ -1294,7 +1294,7 @@
"description": "nir/lower_shader_calls: Repair SSA after wrap_instrs",
"nominated": true,
"nomination_type": 1,
"resolution": 0,
"resolution": 1,
"main_sha": null,
"because_sha": null,
"notes": null

12
src/compiler/nir/nir_lower_shader_calls.c
View file

@ -1228,8 +1228,16 @@ wrap_instr(nir_builder *b, nir_instr *instr, void *data)
static bool
wrap_instrs(nir_shader *shader, wrap_instr_callback callback)
{
return nir_shader_instructions_pass(shader, wrap_instr,
nir_metadata_none, callback);
bool progress = nir_shader_instructions_pass(shader, wrap_instr,
nir_metadata_none, callback);
/* Wrapping jump instructions that are located inside ifs can break SSA
* invariants because the else block no longer dominates the merge block.
* Repair the SSA to make the validator happy again.
*/
if (progress)
nir_repair_ssa(shader);
return progress;
}
static bool