From b8204c8df940566d9e239f11fb0e4c789eb34b11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Mon, 27 Jan 2025 12:44:42 +0100 Subject: [PATCH] ac/nir/ngg: Remove gfx_level and family from NGG lowering options. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit They can be read from radeon_info. Reviewed-by: Marek Olšák Part-of: --- src/amd/common/nir/ac_nir.h | 2 -- src/amd/vulkan/radv_shader.c | 4 +--- src/gallium/drivers/radeonsi/si_shader.c | 2 -- 3 files changed, 1 insertion(+), 7 deletions(-) diff --git a/src/amd/common/nir/ac_nir.h b/src/amd/common/nir/ac_nir.h index f75ac251690..e83c41ac435 100644 --- a/src/amd/common/nir/ac_nir.h +++ b/src/amd/common/nir/ac_nir.h @@ -142,8 +142,6 @@ ac_nir_lower_indirect_derefs(nir_shader *shader, enum amd_gfx_level gfx_level); typedef struct { - enum radeon_family family; - enum amd_gfx_level gfx_level; const struct radeon_info *hw_info; unsigned max_workgroup_size; diff --git a/src/amd/vulkan/radv_shader.c b/src/amd/vulkan/radv_shader.c index 25e8e6d3176..96890b34ce6 100644 --- a/src/amd/vulkan/radv_shader.c +++ b/src/amd/vulkan/radv_shader.c @@ -760,8 +760,6 @@ radv_lower_ngg(struct radv_device *device, struct radv_shader_stage *ngg_stage, nir->info.shared_size = info->ngg_info.lds_size; ac_nir_lower_ngg_options options = {0}; - options.family = pdev->info.family; - options.gfx_level = pdev->info.gfx_level; options.hw_info = &pdev->info; options.max_workgroup_size = info->workgroup_size; options.wave_size = info->wave_size; @@ -804,7 +802,7 @@ radv_lower_ngg(struct radv_device *device, struct radv_shader_stage *ngg_stage, unsigned hw_workgroup_size = ALIGN(info->workgroup_size, info->wave_size); bool scratch_ring = false; - NIR_PASS_V(nir, ac_nir_lower_ngg_mesh, options.gfx_level, options.clip_cull_dist_mask, + NIR_PASS_V(nir, ac_nir_lower_ngg_mesh, pdev->info.gfx_level, options.clip_cull_dist_mask, options.vs_output_param_offset, options.has_param_exports, &scratch_ring, info->wave_size, hw_workgroup_size, gfx_state->has_multiview_view_index, info->ms.has_query, pdev->mesh_fast_launch_2); ngg_stage->info.ms.needs_ms_scratch_ring = scratch_ring; diff --git a/src/gallium/drivers/radeonsi/si_shader.c b/src/gallium/drivers/radeonsi/si_shader.c index 2faa9a954fb..88ba3a1f499 100644 --- a/src/gallium/drivers/radeonsi/si_shader.c +++ b/src/gallium/drivers/radeonsi/si_shader.c @@ -1815,8 +1815,6 @@ static void si_lower_ngg(struct si_shader *shader, nir_shader *nir) sel->info.culldist_mask; ac_nir_lower_ngg_options options = { - .family = sel->screen->info.family, - .gfx_level = sel->screen->info.gfx_level, .hw_info = &sel->screen->info, .max_workgroup_size = si_get_max_workgroup_size(shader), .wave_size = shader->wave_size,