nir/lower_shader_calls: remove empty phis
This is confusing opt_cse.
Signed-off-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Fixes: 8dfb240b1f
("nir: Add raytracing shader call lowering pass.")
Reviewed-by: Daniel Schürmann <daniel@schuermann.dev>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11953>
This commit is contained in:
parent
a1b7a5fad6
commit
01b0935d31
|
@ -1108,6 +1108,8 @@ nir_lower_shader_calls(nir_shader *shader,
|
||||||
NIR_PASS_V(shader, spill_ssa_defs_and_lower_shader_calls,
|
NIR_PASS_V(shader, spill_ssa_defs_and_lower_shader_calls,
|
||||||
num_calls, address_format, stack_alignment);
|
num_calls, address_format, stack_alignment);
|
||||||
|
|
||||||
|
nir_opt_remove_phis(shader);
|
||||||
|
|
||||||
/* Make N copies of our shader */
|
/* Make N copies of our shader */
|
||||||
nir_shader **resume_shaders = ralloc_array(mem_ctx, nir_shader *, num_calls);
|
nir_shader **resume_shaders = ralloc_array(mem_ctx, nir_shader *, num_calls);
|
||||||
for (unsigned i = 0; i < num_calls; i++)
|
for (unsigned i = 0; i < num_calls; i++)
|
||||||
|
@ -1117,6 +1119,7 @@ nir_lower_shader_calls(nir_shader *shader,
|
||||||
for (unsigned i = 0; i < num_calls; i++) {
|
for (unsigned i = 0; i < num_calls; i++) {
|
||||||
nir_instr *resume_instr = lower_resume(resume_shaders[i], i);
|
nir_instr *resume_instr = lower_resume(resume_shaders[i], i);
|
||||||
replace_resume_with_halt(resume_shaders[i], resume_instr);
|
replace_resume_with_halt(resume_shaders[i], resume_instr);
|
||||||
|
nir_opt_remove_phis(resume_shaders[i]);
|
||||||
}
|
}
|
||||||
|
|
||||||
*resume_shaders_out = resume_shaders;
|
*resume_shaders_out = resume_shaders;
|
||||||
|
|
Loading…
Reference in New Issue