From 8efc25c54cdad76f7ea9eea2d000a888ae9073b2 Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 29 Aug 2023 08:39:50 -0400 Subject: [PATCH] radv: Use before/after_cf_list for entrypoints MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Via Coccinelle patch: @@ expression shader; @@ -nir_before_cf_list(&nir_shader_get_entrypoint(shader)->body) +nir_before_impl(nir_shader_get_entrypoint(shader)) @@ expression shader; @@ -nir_after_cf_list(&nir_shader_get_entrypoint(shader)->body) +nir_after_impl(nir_shader_get_entrypoint(shader)) Suggested-by: Daniel Schürmann Reviewed-by: Kenneth Graunke Part-of: --- src/amd/vulkan/radv_pipeline_rt.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/amd/vulkan/radv_pipeline_rt.c b/src/amd/vulkan/radv_pipeline_rt.c index c86ea3a5084..9e5e9981385 100644 --- a/src/amd/vulkan/radv_pipeline_rt.c +++ b/src/amd/vulkan/radv_pipeline_rt.c @@ -331,7 +331,7 @@ should_move_rt_instruction(nir_intrinsic_op intrinsic) static void move_rt_instructions(nir_shader *shader) { - nir_cursor target = nir_before_cf_list(&nir_shader_get_entrypoint(shader)->body); + nir_cursor target = nir_before_impl(nir_shader_get_entrypoint(shader)); nir_foreach_block (block, nir_shader_get_entrypoint(shader)) { nir_foreach_instr_safe (instr, block) { @@ -382,7 +382,7 @@ radv_rt_nir_to_asm(struct radv_device *device, struct vk_pipeline_cache *cache, nir_shader **resume_shaders = NULL; if (stage->stage != MESA_SHADER_INTERSECTION) { - nir_builder b = nir_builder_at(nir_after_cf_list(&nir_shader_get_entrypoint(stage->nir)->body)); + nir_builder b = nir_builder_at(nir_after_impl(nir_shader_get_entrypoint(stage->nir))); nir_rt_return_amd(&b); const nir_lower_shader_calls_options opts = {