fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-07 02:48:06 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

radv/meta: cleanup determining the resolve method

Browse source 
The fragment resolve path supports everything except layers.

Signed-off-by: Samuel Pitoiset <samuel.pitoiset@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/40491>
This commit is contained in:
Samuel Pitoiset 2026-02-13 08:02:13 +01:00 • committed by Marge Bot
parent 82473c1524
commit d2818c5b3f
1 changed files with 19 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/amd/vulkan/meta/radv_meta_resolve.c
View file

@ -18,37 +18,18 @@ enum radv_resolve_method {
RESOLVE_FRAGMENT,
};
static void
radv_pick_resolve_method_images(struct radv_device *device, struct radv_image *src_image, VkFormat src_format,
struct radv_image *dst_image, unsigned dst_level, VkImageLayout dst_image_layout,
struct radv_cmd_buffer *cmd_buffer, enum radv_resolve_method *method)
static enum radv_resolve_method
radv_get_resolve_method(struct radv_image *src_image, struct radv_image *dst_image)
{
uint32_t queue_mask = radv_image_queue_family_mask(dst_image, cmd_buffer->qf, cmd_buffer->qf);
/* Default to the fragment resolve path which is optimal for compression. */
enum radv_resolve_method resolve_method = RESOLVE_FRAGMENT;
if (vk_format_is_color(src_format)) {
/* Using the fragment resolve path is currently a hint to
* avoid decompressing DCC for partial resolves and
* re-initialize it after resolving using compute.
* TODO: Add support for layered and int to the fragment path.
*/
if (radv_layout_dcc_compressed(device, dst_image, dst_level, dst_image_layout, queue_mask)) {
*method = RESOLVE_FRAGMENT;
}
/* TODO: Add layers support to the fragment resolve path. */
if (src_image->vk.array_layers > 1 || dst_image->vk.array_layers > 1 ||
(dst_image->planes[0].surface.flags & RADEON_SURF_NO_RENDER_TARGET))
resolve_method = RESOLVE_COMPUTE;
if (src_format == VK_FORMAT_R16G16_UNORM || src_format == VK_FORMAT_R16G16_SNORM)
*method = RESOLVE_COMPUTE;
else if (vk_format_is_int(src_format))
*method = RESOLVE_COMPUTE;
else if (src_image->vk.array_layers > 1 || dst_image->vk.array_layers > 1)
*method = RESOLVE_COMPUTE;
} else {
if (src_image->vk.array_layers > 1 || dst_image->vk.array_layers > 1 ||
(dst_image->planes[0].surface.flags & RADEON_SURF_NO_RENDER_TARGET))
*method = RESOLVE_COMPUTE;
else
*method = RESOLVE_FRAGMENT;
}
return resolve_method;
}
/**
@ -94,10 +75,12 @@ radv_decompress_resolve_src(struct radv_cmd_buffer *cmd_buffer, struct radv_imag
}
static void
resolve_image(struct radv_cmd_buffer *cmd_buffer, struct radv_image *src_image, VkImageLayout src_image_layout,
struct radv_image *dst_image, VkImageLayout dst_image_layout, const VkImageResolve2 *region,
const VkResolveImageModeInfoKHR *resolve_mode_info, enum radv_resolve_method resolve_method)
radv_resolve_image(struct radv_cmd_buffer *cmd_buffer, struct radv_image *src_image, VkImageLayout src_image_layout,
struct radv_image *dst_image, VkImageLayout dst_image_layout, const VkImageResolve2 *region,
const VkResolveImageModeInfoKHR *resolve_mode_info)
{
const enum radv_resolve_method resolve_method = radv_get_resolve_method(src_image, dst_image);
if (vk_format_is_depth_or_stencil(src_image->vk.format)) {
if ((region->srcSubresource.aspectMask & VK_IMAGE_ASPECT_DEPTH_BIT) &&
resolve_mode_info->resolveMode != VK_RESOLVE_MODE_NONE) {
@ -163,10 +146,8 @@ radv_CmdResolveImage2(VkCommandBuffer commandBuffer, const VkResolveImageInfo2 *
VK_FROM_HANDLE(radv_cmd_buffer, cmd_buffer, commandBuffer);
VK_FROM_HANDLE(radv_image, src_image, pResolveImageInfo->srcImage);
VK_FROM_HANDLE(radv_image, dst_image, pResolveImageInfo->dstImage);
struct radv_device *device = radv_cmd_buffer_device(cmd_buffer);
VkImageLayout src_image_layout = pResolveImageInfo->srcImageLayout;
VkImageLayout dst_image_layout = pResolveImageInfo->dstImageLayout;
enum radv_resolve_method resolve_method = RESOLVE_FRAGMENT;
const VkResolveImageModeInfoKHR *resolve_mode_info =
vk_find_struct_const(pResolveImageInfo->pNext, RESOLVE_IMAGE_MODE_INFO_KHR);
@ -178,11 +159,8 @@ radv_CmdResolveImage2(VkCommandBuffer commandBuffer, const VkResolveImageInfo2 *
for (uint32_t r = 0; r < pResolveImageInfo->regionCount; r++) {
const VkImageResolve2 *region = &pResolveImageInfo->pRegions[r];
radv_pick_resolve_method_images(device, src_image, src_image->vk.format, dst_image,
region->dstSubresource.mipLevel, dst_image_layout, cmd_buffer, &resolve_method);
resolve_image(cmd_buffer, src_image, src_image_layout, dst_image, dst_image_layout, region, resolve_mode_info,
resolve_method);
radv_resolve_image(cmd_buffer, src_image, src_image_layout, dst_image, dst_image_layout, region,
resolve_mode_info);
}
radv_meta_end(cmd_buffer);
@ -196,8 +174,6 @@ radv_CmdResolveImage2(VkCommandBuffer commandBuffer, const VkResolveImageInfo2 *
void
radv_cmd_buffer_resolve_rendering(struct radv_cmd_buffer *cmd_buffer, const VkRenderingInfo *pRenderingInfo)
{
struct radv_device *device = radv_cmd_buffer_device(cmd_buffer);
enum radv_resolve_method resolve_method = RESOLVE_FRAGMENT;
uint32_t layer_count = pRenderingInfo->layerCount;
VkRect2D resolve_area = pRenderingInfo->renderArea;
bool used_compute = false;
@ -248,9 +224,7 @@ radv_cmd_buffer_resolve_rendering(struct radv_cmd_buffer *cmd_buffer, const VkRe
struct radv_image_view *src_iview = d_iview ? d_iview : s_iview;
struct radv_image_view *dst_iview = d_res_iview ? d_res_iview : s_res_iview;
radv_pick_resolve_method_images(device, src_iview->image, src_iview->vk.format, dst_iview->image,
dst_iview->vk.base_mip_level, VK_IMAGE_LAYOUT_UNDEFINED, cmd_buffer,
&resolve_method);
const enum radv_resolve_method resolve_method = radv_get_resolve_method(src_iview->image, dst_iview->image);
VkImageResolve2 region = {
.sType = VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2,
@ -355,8 +329,8 @@ radv_cmd_buffer_resolve_rendering(struct radv_cmd_buffer *cmd_buffer, const VkRe
VkImageLayout dst_layout = att->resolveImageLayout;
struct radv_image *dst_img = dst_iview->image;
radv_pick_resolve_method_images(device, src_img, src_iview->vk.format, dst_img, dst_iview->vk.base_mip_level,
dst_layout, cmd_buffer, &resolve_method);
const enum radv_resolve_method resolve_method = radv_get_resolve_method(src_img, dst_img);
VkImageResolve2 region = {
.sType = VK_STRUCTURE_TYPE_IMAGE_RESOLVE_2,
.extent =