From 0438cc0afb37eb679bfd0fbe603239865b8a4d64 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Mon, 17 Feb 2025 23:49:12 +0100 Subject: [PATCH] ac/nir: Add bool return value to ac_nir_lower_ls_outputs_to_mem. Reviewed-by: Alyssa Rosenzweig Part-of: --- src/amd/common/nir/ac_nir.h | 2 +- src/amd/common/nir/ac_nir_lower_tess_io_to_mem.c | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/amd/common/nir/ac_nir.h b/src/amd/common/nir/ac_nir.h index 4f6ab848e9a..f9dfcda1866 100644 --- a/src/amd/common/nir/ac_nir.h +++ b/src/amd/common/nir/ac_nir.h @@ -89,7 +89,7 @@ bool ac_nir_optimize_outputs(nir_shader *nir, bool sprite_tex_disallowed, int8_t slot_remap[NUM_TOTAL_VARYING_SLOTS], uint8_t param_export_index[NUM_TOTAL_VARYING_SLOTS]); -void +bool ac_nir_lower_ls_outputs_to_mem(nir_shader *ls, ac_nir_map_io_driver_location map, enum amd_gfx_level gfx_level, diff --git a/src/amd/common/nir/ac_nir_lower_tess_io_to_mem.c b/src/amd/common/nir/ac_nir_lower_tess_io_to_mem.c index 7fb27184d13..48d99657b4b 100644 --- a/src/amd/common/nir/ac_nir_lower_tess_io_to_mem.c +++ b/src/amd/common/nir/ac_nir_lower_tess_io_to_mem.c @@ -1167,7 +1167,7 @@ filter_any_input_access(const nir_instr *instr, intrin->intrinsic == nir_intrinsic_load_per_vertex_input; } -void +bool ac_nir_lower_ls_outputs_to_mem(nir_shader *shader, ac_nir_map_io_driver_location map, enum amd_gfx_level gfx_level, @@ -1190,9 +1190,9 @@ ac_nir_lower_ls_outputs_to_mem(nir_shader *shader, state.tcs_inputs_via_lds = tcs_inputs_via_lds | tcs_inputs_via_temp; } - nir_shader_intrinsics_pass(shader, lower_ls_output_store, - nir_metadata_control_flow, - &state); + return nir_shader_intrinsics_pass(shader, lower_ls_output_store, + nir_metadata_control_flow, + &state); } void