From 331b9f73a27c376dcef903dae1096daf356ceeef Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Fri, 8 Apr 2016 17:20:53 -0400 Subject: [PATCH] nir/lower_two_sided_color: fixup for new foreach_block() Reviewed-by: Jason Ekstrand Reviewed-by: Ian Romanick --- src/compiler/nir/nir_lower_two_sided_color.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/src/compiler/nir/nir_lower_two_sided_color.c b/src/compiler/nir/nir_lower_two_sided_color.c index ea432c1bb59..5d8779e14cf 100644 --- a/src/compiler/nir/nir_lower_two_sided_color.c +++ b/src/compiler/nir/nir_lower_two_sided_color.c @@ -133,9 +133,9 @@ setup_inputs(lower_2side_state *state) } static bool -nir_lower_two_sided_color_block(nir_block *block, void *void_state) +nir_lower_two_sided_color_block(nir_block *block, + lower_2side_state *state) { - lower_2side_state *state = void_state; nir_builder *b = &state->b; nir_foreach_instr_safe(instr, block) { @@ -185,7 +185,9 @@ nir_lower_two_sided_color_impl(nir_function_impl *impl, nir_builder_init(b, impl); - nir_foreach_block_call(impl, nir_lower_two_sided_color_block, state); + nir_foreach_block(block, impl) { + nir_lower_two_sided_color_block(block, state); + } nir_metadata_preserve(impl, nir_metadata_block_index | nir_metadata_dominance); -- 2.30.2