From e36fbcfc3ffb5d152c4f65d41ad5c5bce53a995a Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Fri, 8 Apr 2016 15:39:24 -0400 Subject: [PATCH] nir/lower_alu_to_scalar: fixup for new foreach_block() Reviewed-by: Jason Ekstrand --- src/compiler/nir/nir_lower_alu_to_scalar.c | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) diff --git a/src/compiler/nir/nir_lower_alu_to_scalar.c b/src/compiler/nir/nir_lower_alu_to_scalar.c index 589227631ab..a5fc73495b7 100644 --- a/src/compiler/nir/nir_lower_alu_to_scalar.c +++ b/src/compiler/nir/nir_lower_alu_to_scalar.c @@ -240,24 +240,18 @@ lower_alu_instr_scalar(nir_alu_instr *instr, nir_builder *b) nir_instr_remove(&instr->instr); } -static bool -lower_alu_to_scalar_block(nir_block *block, void *builder) -{ - nir_foreach_instr_safe(block, instr) { - if (instr->type == nir_instr_type_alu) - lower_alu_instr_scalar(nir_instr_as_alu(instr), builder); - } - - return true; -} - static void nir_lower_alu_to_scalar_impl(nir_function_impl *impl) { nir_builder builder; nir_builder_init(&builder, impl); - nir_foreach_block_call(impl, lower_alu_to_scalar_block, &builder); + nir_foreach_block(block, impl) { + nir_foreach_instr_safe(block, instr) { + if (instr->type == nir_instr_type_alu) + lower_alu_instr_scalar(nir_instr_as_alu(instr), &builder); + } + } } void -- 2.30.2