Module: Mesa Branch: main Commit: 827b0fa1efd734f76364ac5cd72ae1537062eb71 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=827b0fa1efd734f76364ac5cd72ae1537062eb71
Author: Konstantin Seurer <konstantin.seu...@gmail.com> Date: Sat Nov 18 18:18:47 2023 +0100 nir/lower_vars_to_scratch: Remove all unused derefs If the shader passed to nir_lower_vars_to_scratch contains some unused derefs to a variable that will be lowered, validation will fail because the variable is not part of the shader after the pass. cc: mesa-stable Reviewed-by: Rhys Perry <pendingchao...@gmail.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26271> --- src/compiler/nir/nir_lower_scratch.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/compiler/nir/nir_lower_scratch.c b/src/compiler/nir/nir_lower_scratch.c index 55e58688171..98bb30ee8cb 100644 --- a/src/compiler/nir/nir_lower_scratch.c +++ b/src/compiler/nir/nir_lower_scratch.c @@ -145,13 +145,21 @@ nir_lower_vars_to_scratch(nir_shader *shader, return false; } + bool progress = false; + nir_foreach_function_impl(impl, shader) { nir_foreach_block(block, impl) { - nir_foreach_instr(instr, block) { + nir_foreach_instr_safe(instr, block) { if (instr->type != nir_instr_type_deref) continue; nir_deref_instr *deref = nir_instr_as_deref(instr); + + if (nir_deref_instr_remove_if_unused(deref)) { + progress = true; + continue; + } + if (deref->deref_type != nir_deref_type_var) continue; @@ -178,7 +186,6 @@ nir_lower_vars_to_scratch(nir_shader *shader, var->data.location = INT_MAX; } - bool progress = false; nir_foreach_function_impl(impl, shader) { nir_builder build = nir_builder_create(impl);
