diff options
author | Caio Marcelo de Oliveira Filho <caio.oliveira@intel.com> | 2020-12-15 22:58:58 -0800 |
---|---|---|
committer | Marge Bot <eric+marge@anholt.net> | 2020-12-18 17:41:02 +0000 |
commit | 577bfba95937b90f13b2b256b23dde2a52a09999 (patch) | |
tree | 07891de6f15862c7bf670c2ceae6afbc4a3f01be | |
parent | 617d8d3788eddf1ea049819298da2f8f9629a80b (diff) |
nir: Remove unused parameter in remove_dead_var_writes
And destroy the live set earlier in nir_remove_dead_variables.
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8133>
-rw-r--r-- | src/compiler/nir/nir_remove_dead_variables.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/compiler/nir/nir_remove_dead_variables.c b/src/compiler/nir/nir_remove_dead_variables.c index 01ea18cc37e..deaadf41d66 100644 --- a/src/compiler/nir/nir_remove_dead_variables.c +++ b/src/compiler/nir/nir_remove_dead_variables.c @@ -93,7 +93,7 @@ add_var_use_shader(nir_shader *shader, struct set *live, nir_variable_mode modes } static void -remove_dead_var_writes(nir_shader *shader, struct set *live) +remove_dead_var_writes(nir_shader *shader) { nir_foreach_function(function, shader) { if (!function->impl) @@ -193,12 +193,14 @@ nir_remove_dead_variables(nir_shader *shader, nir_variable_mode modes, } } + _mesa_set_destroy(live, NULL); + nir_foreach_function(function, shader) { if (!function->impl) continue; if (progress) { - remove_dead_var_writes(shader, live); + remove_dead_var_writes(shader); nir_metadata_preserve(function->impl, nir_metadata_block_index | nir_metadata_dominance); } else { @@ -206,6 +208,5 @@ nir_remove_dead_variables(nir_shader *shader, nir_variable_mode modes, } } - _mesa_set_destroy(live, NULL); return progress; } |