AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

radv/meta: remove radv_cmd_buffer_resolve_rendering_{hw,cs,fs}

Browse Source 
Just call the other functions directly.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37792>
This commit is contained in:
Samuel Pitoiset
2025-10-13 11:35:39 +02:00
committed by Marge Bot
parent a81f01bc96
commit df269714ef
4 changed files with 10 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/amd/vulkan/meta/radv_meta.h
View File

@@ -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,

25
src/amd/vulkan/meta/radv_meta_resolve.c
View File

@@ -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, &region);
radv_meta_resolve_hardware_image(cmd_buffer, src_iview->image, src_format, src_layout, dst_iview->image,
dst_format, dst_layout, &region);
break;
case RESOLVE_COMPUTE:
radv_decompress_resolve_src(cmd_buffer, src_iview->image, src_layout, &region);
radv_cmd_buffer_resolve_rendering_cs(cmd_buffer, src_iview, src_format, src_layout, dst_iview, dst_format,
dst_layout, &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);
break;
case RESOLVE_FRAGMENT:
radv_decompress_resolve_src(cmd_buffer, src_iview->image, src_layout, &region);
radv_cmd_buffer_resolve_rendering_fs(cmd_buffer, src_iview, src_format, src_layout, dst_iview, dst_format,
dst_layout, &region);
radv_meta_resolve_fragment_image(cmd_buffer, src_iview->image, src_format, src_layout, dst_iview->image,
dst_format, dst_layout, &region);
break;
default:
UNREACHABLE("Invalid resolve method");

13
src/amd/vulkan/meta/radv_meta_resolve_cs.c
View File

@@ -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,

9
src/amd/vulkan/meta/radv_meta_resolve_fs.c
View File

@@ -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,