nir: rename nir_foreach_block*() to nir_foreach_block*_call()

Reviewed-by: Jason Ekstrand <[email protected]>

4 files changed, 4 insertions, 4 deletions

diff --git a/src/gallium/drivers/vc4/vc4_nir_lower_blend.c b/src/gallium/drivers/vc4/vc4_nir_lower_blend.c
index cf6d2896f7d..99cbf30863a 100644
--- a/src/gallium/drivers/vc4/vc4_nir_lower_blend.c
+++ b/src/gallium/drivers/vc4/vc4_nir_lower_blend.c
@@ -714,7 +714,7 @@ vc4_nir_lower_blend(nir_shader *s, struct vc4_compile *c)
 {
         nir_foreach_function(s, function) {
                 if (function->impl) {
-                        nir_foreach_block(function->impl,
+                        nir_foreach_block_call(function->impl,
                                           vc4_nir_lower_blend_block, c);
 
                         nir_metadata_preserve(function->impl,
diff --git a/src/gallium/drivers/vc4/vc4_nir_lower_io.c b/src/gallium/drivers/vc4/vc4_nir_lower_io.c
index 22c602adb54..be89bfcc937 100644
--- a/src/gallium/drivers/vc4/vc4_nir_lower_io.c
+++ b/src/gallium/drivers/vc4/vc4_nir_lower_io.c
@@ -446,7 +446,7 @@ vc4_nir_lower_io_block(nir_block *block, void *arg)
 static bool
 vc4_nir_lower_io_impl(struct vc4_compile *c, nir_function_impl *impl)
 {
-        nir_foreach_block(impl, vc4_nir_lower_io_block, c);
+        nir_foreach_block_call(impl, vc4_nir_lower_io_block, c);
 
         nir_metadata_preserve(impl, nir_metadata_block_index |
                               nir_metadata_dominance);
diff --git a/src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c b/src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c
index 6b8830743eb..0e7b2d5e25e 100644
--- a/src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c
+++ b/src/gallium/drivers/vc4/vc4_nir_lower_txf_ms.c
@@ -152,7 +152,7 @@ vc4_nir_lower_txf_ms_block(nir_block *block, void *arg)
 static bool
 vc4_nir_lower_txf_ms_impl(struct vc4_compile *c, nir_function_impl *impl)
 {
-        nir_foreach_block(impl, vc4_nir_lower_txf_ms_block, c);
+        nir_foreach_block_call(impl, vc4_nir_lower_txf_ms_block, c);
 
         nir_metadata_preserve(impl,
                               nir_metadata_block_index |
diff --git a/src/gallium/drivers/vc4/vc4_program.c b/src/gallium/drivers/vc4/vc4_program.c
index eccc7ab413f..8aba8badc42 100644
--- a/src/gallium/drivers/vc4/vc4_program.c
+++ b/src/gallium/drivers/vc4/vc4_program.c
@@ -1794,7 +1794,7 @@ count_nir_instrs(nir_shader *nir)
         nir_foreach_function(nir, function) {
                 if (!function->impl)
                         continue;
-                nir_foreach_block(function->impl, count_nir_instrs_in_block, &count);
+                nir_foreach_block_call(function->impl, count_nir_instrs_in_block, &count);
         }
         return count;
 }