From c81ca60b41db4632237dc5facfe4e37e500a840a Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Fri, 8 Apr 2016 16:16:56 -0400 Subject: [PATCH] nir/lower_io: fixup for new foreach_block() Reviewed-by: Jason Ekstrand --- src/compiler/nir/nir_lower_io.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/compiler/nir/nir_lower_io.c b/src/compiler/nir/nir_lower_io.c index 7679c02f601..e0ba9347bfe 100644 --- a/src/compiler/nir/nir_lower_io.c +++ b/src/compiler/nir/nir_lower_io.c @@ -211,10 +211,9 @@ atomic_op(nir_intrinsic_op opcode) } static bool -nir_lower_io_block(nir_block *block, void *void_state) +nir_lower_io_block(nir_block *block, + struct lower_io_state *state) { - struct lower_io_state *state = void_state; - nir_builder *b = &state->builder; nir_foreach_instr_safe(block, instr) { @@ -403,7 +402,9 @@ nir_lower_io_impl(nir_function_impl *impl, state.modes = modes; state.type_size = type_size; - nir_foreach_block_call(impl, nir_lower_io_block, &state); + nir_foreach_block(block, impl) { + nir_lower_io_block(block, &state); + } nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); -- 2.30.2