AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir: Rework nir_lower_constant_initializers() to handle functions

Browse Source 
Previously it assumed that only a single function (the entrypoint)
existed and attempted to lower constant initializers of shader outputs
for each function, for instance.
This commit is contained in:
Matt Turner
2019-01-08 19:49:14 -08:00
parent f998ce4111
commit 393b59e077
1 changed files with 20 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/compiler/nir/nir_lower_constant_initializers.c
View File

@@ -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));
nir_foreach_function(function, shader) {
if (!function->impl)
continue;
if (modes & nir_var_shader_out)
progress |= lower_const_initializer(&builder, &shader->outputs);
bool impl_progress = false;
if (modes & nir_var_private)
progress |= lower_const_initializer(&builder, &shader->globals);
nir_builder builder;
nir_builder_init(&builder, function->impl);
if (modes & nir_var_system_value)
progress |= lower_const_initializer(&builder, &shader->system_values);
if ((modes & nir_var_shader_out) && function->is_entrypoint)
impl_progress |= lower_const_initializer(&builder, &shader->outputs);
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);
}
}
}
if ((modes & nir_var_private) && function->is_entrypoint)
impl_progress |= lower_const_initializer(&builder, &shader->outputs);
if (modes & nir_var_function) {
nir_foreach_function(function, shader) {
if (!function->impl)
continue;
if ((modes & nir_var_system_value) && function->is_entrypoint)
impl_progress |= lower_const_initializer(&builder, &shader->outputs);
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 (modes & nir_var_function)
impl_progress |= lower_const_initializer(&builder, &function->impl->locals);
if (impl_progress) {
progress = true;
nir_metadata_preserve(function->impl, nir_metadata_block_index |
nir_metadata_dominance |
nir_metadata_live_ssa_defs);
}
}