From b6dc940ec273252678d40707d300851fa1c85ea5 Mon Sep 17 00:00:00 2001 From: Connor Abbott Date: Wed, 13 Apr 2016 16:25:34 -0400 Subject: nir: rename nir_foreach_block*() to nir_foreach_block*_call() Reviewed-by: Jason Ekstrand --- src/intel/vulkan/anv_nir_apply_dynamic_offsets.c | 3 ++- src/intel/vulkan/anv_nir_apply_pipeline_layout.c | 6 ++++-- src/intel/vulkan/anv_nir_lower_push_constants.c | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) (limited to 'src/intel') diff --git a/src/intel/vulkan/anv_nir_apply_dynamic_offsets.c b/src/intel/vulkan/anv_nir_apply_dynamic_offsets.c index 06fe8aafd30..bbcbcc08f17 100644 --- a/src/intel/vulkan/anv_nir_apply_dynamic_offsets.c +++ b/src/intel/vulkan/anv_nir_apply_dynamic_offsets.c @@ -156,7 +156,8 @@ anv_nir_apply_dynamic_offsets(struct anv_pipeline *pipeline, nir_foreach_function(shader, function) { if (function->impl) { nir_builder_init(&state.builder, function->impl); - nir_foreach_block(function->impl, apply_dynamic_offsets_block, &state); + nir_foreach_block_call(function->impl, apply_dynamic_offsets_block, + &state); nir_metadata_preserve(function->impl, nir_metadata_block_index | nir_metadata_dominance); } diff --git a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c index ef81afaf552..6b231fdaaef 100644 --- a/src/intel/vulkan/anv_nir_apply_pipeline_layout.c +++ b/src/intel/vulkan/anv_nir_apply_pipeline_layout.c @@ -275,7 +275,8 @@ anv_nir_apply_pipeline_layout(struct anv_pipeline *pipeline, nir_foreach_function(shader, function) { if (function->impl) - nir_foreach_block(function->impl, get_used_bindings_block, &state); + nir_foreach_block_call(function->impl, get_used_bindings_block, + &state); } for (uint32_t set = 0; set < layout->num_sets; set++) { @@ -333,7 +334,8 @@ anv_nir_apply_pipeline_layout(struct anv_pipeline *pipeline, nir_foreach_function(shader, function) { if (function->impl) { nir_builder_init(&state.builder, function->impl); - nir_foreach_block(function->impl, apply_pipeline_layout_block, &state); + nir_foreach_block_call(function->impl, apply_pipeline_layout_block, + &state); nir_metadata_preserve(function->impl, nir_metadata_block_index | nir_metadata_dominance); } diff --git a/src/intel/vulkan/anv_nir_lower_push_constants.c b/src/intel/vulkan/anv_nir_lower_push_constants.c index 44a1a3fde27..7f875eba97c 100644 --- a/src/intel/vulkan/anv_nir_lower_push_constants.c +++ b/src/intel/vulkan/anv_nir_lower_push_constants.c @@ -51,6 +51,6 @@ anv_nir_lower_push_constants(nir_shader *shader) { nir_foreach_function(shader, function) { if (function->impl) - nir_foreach_block(function->impl, lower_push_constants_block, NULL); + nir_foreach_block_call(function->impl, lower_push_constants_block, NULL); } } -- cgit v1.2.3