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

iris: Properly move edgeflag_out from output list to global list

Browse Source 
When demoting it from an output to a global, we need to actually move
it to the correct list.  While here, we also refactor so it's clear
we aren't mutating the list while iterating.

Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2106
Fixes: f9fd04aca1 ("nir: Fix non-determinism in lower_global_vars_to_local")
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Kenneth Graunke
2019-11-14 10:10:27 -08:00
parent 790d0ebef3
commit 39c23fd1bb
1 changed files with 16 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/iris/iris_program.c
+16 -8
View File
@@ -194,17 +194,25 @@ iris_fix_edge_flags(nir_shader *nir)
if (nir->info.stage != MESA_SHADER_VERTEX)
return false;
nir_foreach_variable(var, &nir->outputs) {
if (var->data.location == VARYING_SLOT_EDGE) {
var->data.mode = nir_var_shader_temp;
nir->info.outputs_written &= ~VARYING_BIT_EDGE;
nir->info.inputs_read &= ~VERT_BIT_EDGEFLAG;
nir_fixup_deref_modes(nir);
return true;
nir_variable *var = NULL;
nir_foreach_variable(v, &nir->outputs) {
if (v->data.location == VARYING_SLOT_EDGE) {
var = v;
break;
}
}
return false;
if (!var)
return false;
exec_node_remove(&var->node);
var->data.mode = nir_var_shader_temp;
exec_list_push_tail(&nir->globals, &var->node);
nir->info.outputs_written &= ~VARYING_BIT_EDGE;
nir->info.inputs_read &= ~VERT_BIT_EDGEFLAG;
nir_fixup_deref_modes(nir);
return true;
}
/**