From ea3c04b5350ef1e733c3ff10c3321cde220f2cfe Mon Sep 17 00:00:00 2001 From: Georg Lehmann Date: Wed, 26 Feb 2025 17:26:31 +0100 Subject: [PATCH] radv/nir_lower_ray_queries: use nir_foreach_function_impl Reviewed-by: Samuel Pitoiset Reviewed-by: Alyssa Rosenzweig Part-of: --- src/amd/vulkan/nir/radv_nir_lower_ray_queries.c | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/src/amd/vulkan/nir/radv_nir_lower_ray_queries.c b/src/amd/vulkan/nir/radv_nir_lower_ray_queries.c index 217174c3cf4..92f539ae994 100644 --- a/src/amd/vulkan/nir/radv_nir_lower_ray_queries.c +++ b/src/amd/vulkan/nir/radv_nir_lower_ray_queries.c @@ -644,13 +644,10 @@ radv_nir_lower_ray_queries(struct nir_shader *shader, struct radv_device *device progress = true; } - nir_foreach_function (function, shader) { - if (!function->impl) - continue; + nir_foreach_function_impl (impl, shader) { + nir_builder builder = nir_builder_create(impl); - nir_builder builder = nir_builder_create(function->impl); - - nir_foreach_variable_in_list (var, &function->impl->locals) { + nir_foreach_variable_in_list (var, &impl->locals) { if (!var->data.ray_query) continue; @@ -659,7 +656,7 @@ radv_nir_lower_ray_queries(struct nir_shader *shader, struct radv_device *device progress = true; } - nir_foreach_block (block, function->impl) { + nir_foreach_block (block, impl) { nir_foreach_instr_safe (instr, block) { if (instr->type != nir_instr_type_intrinsic) continue; @@ -719,7 +716,7 @@ radv_nir_lower_ray_queries(struct nir_shader *shader, struct radv_device *device } } - nir_progress(true, function->impl, nir_metadata_none); + nir_progress(true, impl, nir_metadata_none); } ralloc_free(query_ht);