diff options
Diffstat (limited to 'src/compiler')
| -rw-r--r-- | src/compiler/nir/nir_lower_constant_initializers.c | 59 |
1 files changed, 25 insertions, 34 deletions
diff --git a/src/compiler/nir/nir_lower_constant_initializers.c b/src/compiler/nir/nir_lower_constant_initializers.c index b213576bbd5..b1c51834917 100644 --- a/src/compiler/nir/nir_lower_constant_initializers.c +++ b/src/compiler/nir/nir_lower_constant_initializers.c @@ -91,41 +91,32 @@ nir_lower_constant_initializers(nir_shader *shader, nir_variable_mode modes) { bool progress = false; - nir_builder builder; - if (modes & ~nir_var_function) - nir_builder_init(&builder, nir_shader_get_entrypoint(shader)); - - if (modes & nir_var_shader_out) - progress |= lower_const_initializer(&builder, &shader->outputs); - - if (modes & nir_var_private) - progress |= lower_const_initializer(&builder, &shader->globals); - - if (modes & nir_var_system_value) - progress |= lower_const_initializer(&builder, &shader->system_values); - - if (progress) { - nir_foreach_function(function, shader) { - if (function->impl) { - nir_metadata_preserve(function->impl, nir_metadata_block_index | - nir_metadata_dominance | - nir_metadata_live_ssa_defs); - } - } - } + nir_foreach_function(function, shader) { + if (!function->impl) + continue; + + bool impl_progress = false; + + nir_builder builder; + nir_builder_init(&builder, function->impl); + + if ((modes & nir_var_shader_out) && function->is_entrypoint) + impl_progress |= lower_const_initializer(&builder, &shader->outputs); + + if ((modes & nir_var_private) && function->is_entrypoint) + impl_progress |= lower_const_initializer(&builder, &shader->outputs); + + if ((modes & nir_var_system_value) && function->is_entrypoint) + impl_progress |= lower_const_initializer(&builder, &shader->outputs); + + if (modes & nir_var_function) + impl_progress |= lower_const_initializer(&builder, &function->impl->locals); - if (modes & nir_var_function) { - nir_foreach_function(function, shader) { - if (!function->impl) - continue; - - nir_builder_init(&builder, function->impl); - if (lower_const_initializer(&builder, &function->impl->locals)) { - nir_metadata_preserve(function->impl, nir_metadata_block_index | - nir_metadata_dominance | - nir_metadata_live_ssa_defs); - progress = true; - } + if (impl_progress) { + progress = true; + nir_metadata_preserve(function->impl, nir_metadata_block_index | + nir_metadata_dominance | + nir_metadata_live_ssa_defs); } } |