From 15264133d7f3b2c63839ae20f45243b62d9f8edd Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Fri, 8 Apr 2016 15:56:09 -0400 Subject: [PATCH] nir/lower_locals_to_regs: fixup for new foreach_block() Reviewed-by: Jason Ekstrand --- src/compiler/nir/nir_lower_locals_to_regs.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/compiler/nir/nir_lower_locals_to_regs.c b/src/compiler/nir/nir_lower_locals_to_regs.c index 0a4d9befd73..3465d54224d 100644 --- a/src/compiler/nir/nir_lower_locals_to_regs.c +++ b/src/compiler/nir/nir_lower_locals_to_regs.c @@ -201,10 +201,9 @@ get_deref_reg_src(nir_deref_var *deref, nir_instr *instr, } static bool -lower_locals_to_regs_block(nir_block *block, void *void_state) +lower_locals_to_regs_block(nir_block *block, + struct locals_to_regs_state *state) { - struct locals_to_regs_state *state = void_state; - nir_foreach_instr_safe(block, instr) { if (instr->type != nir_instr_type_intrinsic) continue; @@ -358,7 +357,9 @@ nir_lower_locals_to_regs_impl(nir_function_impl *impl) nir_metadata_require(impl, nir_metadata_dominance); - nir_foreach_block_call(impl, lower_locals_to_regs_block, &state); + nir_foreach_block(block, impl) { + lower_locals_to_regs_block(block, &state); + } nir_array_foreach(&state.derefs_array, nir_deref_var *, deref_ptr) { nir_deref_var *deref = *deref_ptr; -- 2.30.2