OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

nir/lower_vars_to_ssa: fixup for new foreach_block()

Browse Source 
Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>
This commit is contained in:
Connor Abbott
2016-04-08 16:39:38 -04:00
committed by Jason Ekstrand
parent 1557344c81
commit ceed12557d
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/compiler/nir/nir_lower_vars_to_ssa.c
View File

@@ -404,10 +404,9 @@ register_copy_instr(nir_intrinsic_instr *copy_instr,
/* Registers all variable uses in the given block. */ /* Registers all variable uses in the given block. */
static bool static bool
register_variable_uses_block(nir_block *block, void *void_state) register_variable_uses_block(nir_block *block,
struct lower_variables_state *state)
{ {
struct lower_variables_state *state = void_state;
nir_foreach_instr_safe(block, instr) { nir_foreach_instr_safe(block, instr) {
if (instr->type != nir_instr_type_intrinsic) if (instr->type != nir_instr_type_intrinsic)
continue; continue;
@@ -653,7 +652,10 @@ nir_lower_vars_to_ssa_impl(nir_function_impl *impl)
/* Build the initial deref structures and direct_deref_nodes table */ /* Build the initial deref structures and direct_deref_nodes table */
state.add_to_direct_deref_nodes = true; state.add_to_direct_deref_nodes = true;
nir_foreach_block_call(impl, register_variable_uses_block, &state);
nir_foreach_block(block, impl) {
register_variable_uses_block(block, &state);
}
bool progress = false; bool progress = false;
@@ -693,7 +695,9 @@ nir_lower_vars_to_ssa_impl(nir_function_impl *impl)
* added load/store instructions are registered. We need this * added load/store instructions are registered. We need this
* information for phi node insertion below. * information for phi node insertion below.
*/ */
nir_foreach_block_call(impl, register_variable_uses_block, &state); nir_foreach_block(block, impl) {
register_variable_uses_block(block, &state);
}
state.phi_builder = nir_phi_builder_create(state.impl); state.phi_builder = nir_phi_builder_create(state.impl);