From 8b5e8b2af728653c17af5ef26c03b60bafa76c7b Mon Sep 17 00:00:00 2001 From: Qiang Yu Date: Mon, 30 May 2022 20:06:03 +0800 Subject: [PATCH] ac/nir: remove unused param num_reserved_es_outputs from gs input lower MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Reviewed-by: Marek Olšák Reviewed-by: Timur Kristóf Signed-off-by: Qiang Yu Part-of: --- src/amd/common/ac_nir.h | 3 +-- src/amd/common/ac_nir_lower_esgs_io_to_mem.c | 4 +--- src/amd/vulkan/radv_shader.c | 3 +-- 3 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/amd/common/ac_nir.h b/src/amd/common/ac_nir.h index 08f55470d76..50b82a7303f 100644 --- a/src/amd/common/ac_nir.h +++ b/src/amd/common/ac_nir.h @@ -107,8 +107,7 @@ ac_nir_lower_es_outputs_to_mem(nir_shader *shader, void ac_nir_lower_gs_inputs_to_mem(nir_shader *shader, ac_nir_map_io_driver_location map, - enum amd_gfx_level gfx_level, - unsigned num_reserved_es_outputs); + enum amd_gfx_level gfx_level); bool ac_nir_lower_indirect_derefs(nir_shader *shader, diff --git a/src/amd/common/ac_nir_lower_esgs_io_to_mem.c b/src/amd/common/ac_nir_lower_esgs_io_to_mem.c index 70aad36106f..2f79e5a6d6d 100644 --- a/src/amd/common/ac_nir_lower_esgs_io_to_mem.c +++ b/src/amd/common/ac_nir_lower_esgs_io_to_mem.c @@ -284,12 +284,10 @@ ac_nir_lower_es_outputs_to_mem(nir_shader *shader, void ac_nir_lower_gs_inputs_to_mem(nir_shader *shader, ac_nir_map_io_driver_location map, - enum amd_gfx_level gfx_level, - unsigned num_reserved_es_outputs) + enum amd_gfx_level gfx_level) { lower_esgs_io_state state = { .gfx_level = gfx_level, - .num_reserved_es_outputs = num_reserved_es_outputs, .map_io = map, }; diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index ca3f112385d..ed67a3f4d40 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -1139,8 +1139,7 @@ radv_lower_io_to_mem(struct radv_device *device, struct radv_pipeline_stage *sta return true; } else if (nir->info.stage == MESA_SHADER_GEOMETRY) { NIR_PASS_V(nir, ac_nir_lower_gs_inputs_to_mem, NULL, - device->physical_device->rad_info.gfx_level, - info->gs.num_linked_inputs); + device->physical_device->rad_info.gfx_level); return true; } else if (nir->info.stage == MESA_SHADER_TASK) { ac_nir_apply_first_task_to_task_shader(nir);