From 892ebf204078fa16fc87646ba7bca9ad97cf2d78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Timur=20Krist=C3=B3f?= Date: Sun, 31 Mar 2024 00:19:30 +0100 Subject: [PATCH] radv: Add radv_gather_unlinked_io_mask to shader info header. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit We will call this from another file. Signed-off-by: Timur Kristóf Reviewed-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/radv_shader_info.c | 8 ++++---- src/amd/vulkan/radv_shader_info.h | 2 ++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/amd/vulkan/radv_shader_info.c b/src/amd/vulkan/radv_shader_info.c index ead217c7cfd..6c0a42ec91d 100644 --- a/src/amd/vulkan/radv_shader_info.c +++ b/src/amd/vulkan/radv_shader_info.c @@ -453,8 +453,8 @@ gather_shader_info_ngg_query(struct radv_device *device, struct radv_shader_info info->has_prim_query = device->cache_key.primitives_generated_query || info->has_xfb_query; } -static uint64_t -gather_io_mask(const uint64_t nir_mask) +uint64_t +radv_gather_unlinked_io_mask(const uint64_t nir_mask) { /* Select the correct NIR IO mask. * Exclude per-patch built-in variables, because in NIR they are not part of the patch I/O masks. @@ -481,7 +481,7 @@ gather_info_unlinked_input(struct radv_shader_info *info, const nir_shader *nir) if (info->inputs_linked) return; - const uint64_t io_mask = gather_io_mask(nir->info.inputs_read); + const uint64_t io_mask = radv_gather_unlinked_io_mask(nir->info.inputs_read); const unsigned num_linked_inputs = util_last_bit64(io_mask); switch (nir->info.stage) { @@ -505,7 +505,7 @@ gather_info_unlinked_output(struct radv_shader_info *info, const nir_shader *nir if (info->outputs_linked) return; - const uint64_t io_mask = gather_io_mask(nir->info.outputs_written); + const uint64_t io_mask = radv_gather_unlinked_io_mask(nir->info.outputs_written); const unsigned num_linked_outputs = util_last_bit64(io_mask); switch (nir->info.stage) { diff --git a/src/amd/vulkan/radv_shader_info.h b/src/amd/vulkan/radv_shader_info.h index 9329fc17b9f..bd3b17f5aaf 100644 --- a/src/amd/vulkan/radv_shader_info.h +++ b/src/amd/vulkan/radv_shader_info.h @@ -264,4 +264,6 @@ void radv_nir_shader_info_link(struct radv_device *device, const struct radv_gra enum ac_hw_stage radv_select_hw_stage(const struct radv_shader_info *const info, const enum amd_gfx_level gfx_level); +uint64_t radv_gather_unlinked_io_mask(const uint64_t nir_mask); + #endif /* RADV_SHADER_INFO_H */