From ec819a16b92c42b54f052cd487822426f9fb2c6a Mon Sep 17 00:00:00 2001 From: Yonggang Luo Date: Fri, 30 Jun 2023 04:24:32 +0800 Subject: [PATCH] iris: Convert to use nir_foreach_function_impl Signed-off-by: Yonggang Luo Reviewed-by: Lionel Landwerlin Part-of: --- src/gallium/drivers/iris/iris_program.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) diff --git a/src/gallium/drivers/iris/iris_program.c b/src/gallium/drivers/iris/iris_program.c index bbce212..1f2852d 100644 --- a/src/gallium/drivers/iris/iris_program.c +++ b/src/gallium/drivers/iris/iris_program.c @@ -300,11 +300,8 @@ iris_lower_storage_image_derefs(nir_shader *nir) static bool iris_uses_image_atomic(const nir_shader *shader) { - nir_foreach_function(function, shader) { - if (function->impl == NULL) - continue; - - nir_foreach_block(block, function->impl) { + nir_foreach_function_impl(impl, shader) { + nir_foreach_block(block, impl) { nir_foreach_instr(instr, block) { if (instr->type != nir_instr_type_intrinsic) continue; @@ -353,13 +350,11 @@ iris_fix_edge_flags(nir_shader *nir) nir->info.inputs_read &= ~VERT_BIT_EDGEFLAG; nir_fixup_deref_modes(nir); - nir_foreach_function(f, nir) { - if (f->impl) { - nir_metadata_preserve(f->impl, nir_metadata_block_index | - nir_metadata_dominance | - nir_metadata_live_ssa_defs | - nir_metadata_loop_analysis); - } + nir_foreach_function_impl(impl, nir) { + nir_metadata_preserve(impl, nir_metadata_block_index | + nir_metadata_dominance | + nir_metadata_live_ssa_defs | + nir_metadata_loop_analysis); } return true; -- 2.7.4