nir/lower_alu_to_scalar: fixup for new foreach_block()

Reviewed-by: Jason Ekstrand <jason@jlekstrand.net>

diff --git a/src/compiler/nir/nir_lower_alu_to_scalar.c b/src/compiler/nir/nir_lower_alu_to_scalar.c
index 589227631abf6c453a72af56af648593ab72033f..a5fc73495b7a43ba9b5a2a4c891db2f691b6589a 100644 (file)
--- 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