From 6b006db4924e3a7877e36e3a54b1ad5b095e54cc Mon Sep 17 00:00:00 2001 From: Alyssa Rosenzweig Date: Tue, 7 Oct 2025 16:59:18 -0400 Subject: [PATCH] brw/nir_lower_storage_image: use helper Signed-off-by: Alyssa Rosenzweig Reviewed-by: Ian Romanick Part-of: --- .../compiler/brw/brw_nir_lower_storage_image.c | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/src/intel/compiler/brw/brw_nir_lower_storage_image.c b/src/intel/compiler/brw/brw_nir_lower_storage_image.c index 4eb42488355..34b71226efc 100644 --- a/src/intel/compiler/brw/brw_nir_lower_storage_image.c +++ b/src/intel/compiler/brw/brw_nir_lower_storage_image.c @@ -411,16 +411,10 @@ lower_image_store_instr(nir_builder *b, } static bool -brw_nir_lower_storage_image_instr(nir_builder *b, - nir_instr *instr, - void *cb_data) +lower(nir_builder *b, nir_intrinsic_instr *intrin, void *cb_data) { - if (instr->type != nir_instr_type_intrinsic) - return false; - const struct brw_nir_lower_storage_image_state *state = cb_data; - nir_intrinsic_instr *intrin = nir_instr_as_intrinsic(instr); switch (intrin->intrinsic) { case nir_intrinsic_image_deref_load: { if (nir_intrinsic_format(intrin) == PIPE_FORMAT_NONE) { @@ -433,7 +427,7 @@ brw_nir_lower_storage_image_instr(nir_builder *b, } } return false; - } + } case nir_intrinsic_image_deref_sparse_load: { if (nir_intrinsic_format(intrin) == PIPE_FORMAT_NONE) { @@ -476,10 +470,8 @@ brw_nir_lower_storage_image(nir_shader *shader, .compiler = compiler, .opts = *opts, }; - progress |= nir_shader_instructions_pass(shader, - brw_nir_lower_storage_image_instr, - nir_metadata_none, - (void *)&storage_options); + progress |= nir_shader_intrinsics_pass(shader, lower, nir_metadata_none, + (void *)&storage_options); return progress; }