From ff225dee67e6bba605e7d4ca8eb4d8653c78f5c8 Mon Sep 17 00:00:00 2001 From: Georg Lehmann Date: Sat, 1 Feb 2025 20:21:07 +0100 Subject: [PATCH] radv: inline radv_nir_lower_poly_line_smooth Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/meson.build | 1 - src/amd/vulkan/nir/radv_nir.h | 2 -- .../nir/radv_nir_lower_poly_line_smooth.c | 23 ------------------- src/amd/vulkan/radv_pipeline_graphics.c | 6 +++-- 4 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 src/amd/vulkan/nir/radv_nir_lower_poly_line_smooth.c diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build index d8bcdda4224..7715bb4044b 100644 --- a/src/amd/vulkan/meson.build +++ b/src/amd/vulkan/meson.build @@ -72,7 +72,6 @@ libradv_files = files( 'nir/radv_nir_lower_hit_attrib_derefs.c', 'nir/radv_nir_lower_intrinsics_early.c', 'nir/radv_nir_lower_io.c', - 'nir/radv_nir_lower_poly_line_smooth.c', 'nir/radv_nir_lower_primitive_shading_rate.c', 'nir/radv_nir_lower_ray_queries.c', 'nir/radv_nir_lower_view_index.c', diff --git a/src/amd/vulkan/nir/radv_nir.h b/src/amd/vulkan/nir/radv_nir.h index 0aa56c84380..3e1175b5bba 100644 --- a/src/amd/vulkan/nir/radv_nir.h +++ b/src/amd/vulkan/nir/radv_nir.h @@ -69,8 +69,6 @@ void radv_nir_lower_io(struct radv_device *device, nir_shader *nir); bool radv_nir_lower_io_to_mem(struct radv_device *device, struct radv_shader_stage *stage); -void radv_nir_lower_poly_line_smooth(nir_shader *nir, const struct radv_graphics_state_key *gfx_state); - bool radv_nir_lower_cooperative_matrix(nir_shader *shader, unsigned wave_size); bool radv_nir_lower_draw_id_to_zero(nir_shader *shader); diff --git a/src/amd/vulkan/nir/radv_nir_lower_poly_line_smooth.c b/src/amd/vulkan/nir/radv_nir_lower_poly_line_smooth.c deleted file mode 100644 index 02c92adaf84..00000000000 --- a/src/amd/vulkan/nir/radv_nir_lower_poly_line_smooth.c +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright © 2023 Valve Corporation - * - * SPDX-License-Identifier: MIT - */ - -#include "nir.h" -#include "nir_builder.h" -#include "radv_nir.h" -#include "radv_pipeline_graphics.h" - -void -radv_nir_lower_poly_line_smooth(nir_shader *nir, const struct radv_graphics_state_key *gfx_state) -{ - bool progress = false; - - if (!gfx_state->dynamic_line_rast_mode) - return false; - - NIR_PASS(progress, nir, nir_lower_poly_line_smooth, RADV_NUM_SMOOTH_AA_SAMPLES); - if (progress) - nir_shader_gather_info(nir, nir_shader_get_entrypoint(nir)); -} diff --git a/src/amd/vulkan/radv_pipeline_graphics.c b/src/amd/vulkan/radv_pipeline_graphics.c index dccac7a6ef4..8d5a972d4e5 100644 --- a/src/amd/vulkan/radv_pipeline_graphics.c +++ b/src/amd/vulkan/radv_pipeline_graphics.c @@ -2727,12 +2727,14 @@ radv_graphics_shaders_compile(struct radv_device *device, struct vk_pipeline_cac } if (stages[MESA_SHADER_FRAGMENT].nir) { - radv_nir_lower_poly_line_smooth(stages[MESA_SHADER_FRAGMENT].nir, gfx_state); + bool update_info = false; + if (gfx_state->dynamic_line_rast_mode) + NIR_PASS(update_info, stages[MESA_SHADER_FRAGMENT].nir, nir_lower_poly_line_smooth, + RADV_NUM_SMOOTH_AA_SAMPLES); if (!gfx_state->ps.has_epilog) radv_nir_remap_color_attachment(stages[MESA_SHADER_FRAGMENT].nir, gfx_state); - bool update_info = false; NIR_PASS(update_info, stages[MESA_SHADER_FRAGMENT].nir, nir_opt_frag_coord_to_pixel_coord); if (update_info) nir_shader_gather_info(stages[MESA_SHADER_FRAGMENT].nir,