From df269714ef8dd7eb074d2b32457cbc6f28db4184 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Mon, 13 Oct 2025 11:35:39 +0200 Subject: [PATCH] radv/meta: remove radv_cmd_buffer_resolve_rendering_{hw,cs,fs} Just call the other functions directly. Signed-off-by: Samuel Pitoiset Part-of: --- src/amd/vulkan/meta/radv_meta.h | 10 --------- src/amd/vulkan/meta/radv_meta_resolve.c | 25 +++++++++------------- src/amd/vulkan/meta/radv_meta_resolve_cs.c | 13 ----------- src/amd/vulkan/meta/radv_meta_resolve_fs.c | 9 -------- 4 files changed, 10 insertions(+), 47 deletions(-) diff --git a/src/amd/vulkan/meta/radv_meta.h b/src/amd/vulkan/meta/radv_meta.h index 766a353cc30..4401ff72c6c 100644 --- a/src/amd/vulkan/meta/radv_meta.h +++ b/src/amd/vulkan/meta/radv_meta.h @@ -273,22 +273,12 @@ void radv_cmd_buffer_clear_rendering(struct radv_cmd_buffer *cmd_buffer, const V void radv_cmd_buffer_resolve_rendering(struct radv_cmd_buffer *cmd_buffer); -void radv_cmd_buffer_resolve_rendering_cs(struct radv_cmd_buffer *cmd_buffer, struct radv_image_view *src_iview, - VkFormat src_format, VkImageLayout src_layout, - struct radv_image_view *dst_iview, VkFormat dst_format, - VkImageLayout dst_layout, const VkImageResolve2 *region); - void radv_meta_resolve_depth_stencil_cs(struct radv_cmd_buffer *cmd_buffer, struct radv_image *src_image, VkFormat src_format, VkImageLayout src_image_layout, struct radv_image *dst_image, VkFormat dst_format, VkImageLayout dst_image_layout, VkResolveModeFlagBits resolve_mode, const VkImageResolve2 *region); -void radv_cmd_buffer_resolve_rendering_fs(struct radv_cmd_buffer *cmd_buffer, struct radv_image_view *src_iview, - VkFormat src_format, VkImageLayout src_layout, - struct radv_image_view *dst_iview, VkFormat dst_format, - VkImageLayout dst_layout, const VkImageResolve2 *region); - void radv_meta_resolve_depth_stencil_fs(struct radv_cmd_buffer *cmd_buffer, struct radv_image *src_image, VkFormat src_format, VkImageLayout src_image_layout, struct radv_image *dst_image, VkFormat dst_format, diff --git a/src/amd/vulkan/meta/radv_meta_resolve.c b/src/amd/vulkan/meta/radv_meta_resolve.c index 4c9a209c6a9..b70260ef665 100644 --- a/src/amd/vulkan/meta/radv_meta_resolve.c +++ b/src/amd/vulkan/meta/radv_meta_resolve.c @@ -441,15 +441,6 @@ radv_CmdResolveImage2(VkCommandBuffer commandBuffer, const VkResolveImageInfo2 * radv_resume_conditional_rendering(cmd_buffer); } -static void -radv_cmd_buffer_resolve_rendering_hw(struct radv_cmd_buffer *cmd_buffer, struct radv_image_view *src_iview, - VkFormat src_format, VkImageLayout src_layout, struct radv_image_view *dst_iview, - VkFormat dst_format, VkImageLayout dst_layout, const VkImageResolve2 *region) -{ - radv_meta_resolve_hardware_image(cmd_buffer, src_iview->image, src_format, src_layout, dst_iview->image, dst_format, - dst_layout, region); -} - /** * Emit any needed resolves for the current subpass. */ @@ -628,20 +619,24 @@ radv_cmd_buffer_resolve_rendering(struct radv_cmd_buffer *cmd_buffer) switch (resolve_method) { case RESOLVE_HW: - radv_cmd_buffer_resolve_rendering_hw(cmd_buffer, src_iview, src_format, src_layout, dst_iview, dst_format, - dst_layout, ®ion); + radv_meta_resolve_hardware_image(cmd_buffer, src_iview->image, src_format, src_layout, dst_iview->image, + dst_format, dst_layout, ®ion); break; case RESOLVE_COMPUTE: radv_decompress_resolve_src(cmd_buffer, src_iview->image, src_layout, ®ion); - radv_cmd_buffer_resolve_rendering_cs(cmd_buffer, src_iview, src_format, src_layout, dst_iview, dst_format, - dst_layout, ®ion); + radv_meta_resolve_compute_image(cmd_buffer, src_iview->image, src_format, src_layout, dst_iview->image, + dst_format, dst_layout, ®ion); + + cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_CS_PARTIAL_FLUSH | RADV_CMD_FLAG_INV_VCACHE | + radv_src_access_flush(cmd_buffer, VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT, + VK_ACCESS_2_SHADER_WRITE_BIT, 0, NULL, NULL); break; case RESOLVE_FRAGMENT: radv_decompress_resolve_src(cmd_buffer, src_iview->image, src_layout, ®ion); - radv_cmd_buffer_resolve_rendering_fs(cmd_buffer, src_iview, src_format, src_layout, dst_iview, dst_format, - dst_layout, ®ion); + radv_meta_resolve_fragment_image(cmd_buffer, src_iview->image, src_format, src_layout, dst_iview->image, + dst_format, dst_layout, ®ion); break; default: UNREACHABLE("Invalid resolve method"); diff --git a/src/amd/vulkan/meta/radv_meta_resolve_cs.c b/src/amd/vulkan/meta/radv_meta_resolve_cs.c index d5a445d2bd8..718bc3201d4 100644 --- a/src/amd/vulkan/meta/radv_meta_resolve_cs.c +++ b/src/amd/vulkan/meta/radv_meta_resolve_cs.c @@ -353,19 +353,6 @@ radv_meta_resolve_compute_image(struct radv_cmd_buffer *cmd_buffer, struct radv_ } } -void -radv_cmd_buffer_resolve_rendering_cs(struct radv_cmd_buffer *cmd_buffer, struct radv_image_view *src_iview, - VkFormat src_format, VkImageLayout src_layout, struct radv_image_view *dst_iview, - VkFormat dst_format, VkImageLayout dst_layout, const VkImageResolve2 *region) -{ - radv_meta_resolve_compute_image(cmd_buffer, src_iview->image, src_format, src_layout, dst_iview->image, dst_format, - dst_layout, region); - - cmd_buffer->state.flush_bits |= RADV_CMD_FLAG_CS_PARTIAL_FLUSH | RADV_CMD_FLAG_INV_VCACHE | - radv_src_access_flush(cmd_buffer, VK_PIPELINE_STAGE_2_COMPUTE_SHADER_BIT, - VK_ACCESS_2_SHADER_WRITE_BIT, 0, NULL, NULL); -} - void radv_meta_resolve_depth_stencil_cs(struct radv_cmd_buffer *cmd_buffer, struct radv_image *src_image, VkFormat src_format, VkImageLayout src_image_layout, struct radv_image *dst_image, diff --git a/src/amd/vulkan/meta/radv_meta_resolve_fs.c b/src/amd/vulkan/meta/radv_meta_resolve_fs.c index 3bdbd210c85..22b155b3422 100644 --- a/src/amd/vulkan/meta/radv_meta_resolve_fs.c +++ b/src/amd/vulkan/meta/radv_meta_resolve_fs.c @@ -535,15 +535,6 @@ radv_meta_resolve_fragment_image(struct radv_cmd_buffer *cmd_buffer, struct radv radv_meta_restore(&saved_state, cmd_buffer); } -void -radv_cmd_buffer_resolve_rendering_fs(struct radv_cmd_buffer *cmd_buffer, struct radv_image_view *src_iview, - VkFormat src_format, VkImageLayout src_layout, struct radv_image_view *dst_iview, - VkFormat dst_format, VkImageLayout dst_layout, const VkImageResolve2 *region) -{ - radv_meta_resolve_fragment_image(cmd_buffer, src_iview->image, src_format, src_layout, dst_iview->image, dst_format, - dst_layout, region); -} - void radv_meta_resolve_depth_stencil_fs(struct radv_cmd_buffer *cmd_buffer, struct radv_image *src_image, VkFormat src_format, VkImageLayout src_image_layout, struct radv_image *dst_image,