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

nir/lower_outputs_to_temporaries: fixup for new foreach_block() 

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
Reviewed-by: Ian Romanick <ian.d.romanick@intel.com>
This commit is contained in:
Connor Abbott 2016-04-08 16:22:13 -04:00 committed by Jason Ekstrand
parent b593737ed8
commit 8a7fe634d2
1 changed files with 12 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
src/compiler/nir/nir_lower_outputs_to_temporaries.c
View File

@ -58,21 +58,6 @@ emit_output_copies(nir_cursor cursor, struct lower_outputs_state *state)
}
}
static bool
emit_output_copies_block(nir_block *block, void *state)
{
nir_foreach_instr(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
continue;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
if (intrin->intrinsic == nir_intrinsic_emit_vertex)
emit_output_copies(nir_before_instr(&intrin->instr), state);
}
return true;
}
void
nir_lower_outputs_to_temporaries(nir_shader *shader, nir_function *entrypoint)
{
@ -116,7 +101,18 @@ nir_lower_outputs_to_temporaries(nir_shader *shader, nir_function *entrypoint)
/* For geometry shaders, we have to emit the output copies right
* before each EmitVertex call.
*/
nir_foreach_block_call(function->impl, emit_output_copies_block, &state);
nir_foreach_block(block, function->impl) {
nir_foreach_instr(instr, block) {
if (instr->type != nir_instr_type_intrinsic)
continue;
nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr);
if (intrin->intrinsic == nir_intrinsic_emit_vertex) {
emit_output_copies(nir_before_instr(&intrin->instr),
&state);
}
}
}
} else if (function == entrypoint) {
/* For all other shader types, we need to do the copies right before
* the jumps to the end block.