From 62510846b6ed7083b384d7f5b9765aebf34b2e3a Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Fri, 13 Apr 2018 19:14:52 +0200 Subject: [PATCH] radv: clean up radv_decompress_resolve_subpass_src() To handle the source color image transitions in the same place. Signed-off-by: Samuel Pitoiset Reviewed-by: Bas Niuwenhuizen --- src/amd/vulkan/radv_meta_resolve.c | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/src/amd/vulkan/radv_meta_resolve.c b/src/amd/vulkan/radv_meta_resolve.c index 1828eb37f46..d66f1c9f933 100644 --- a/src/amd/vulkan/radv_meta_resolve.c +++ b/src/amd/vulkan/radv_meta_resolve.c @@ -689,18 +689,15 @@ radv_decompress_resolve_subpass_src(struct radv_cmd_buffer *cmd_buffer) dest_att.attachment == VK_ATTACHMENT_UNUSED) continue; - struct radv_image_view *src_iview = - fb->attachments[src_att.attachment].attachment; + struct radv_image *src_image = + fb->attachments[src_att.attachment].attachment->image; - VkImageSubresourceRange range; - range.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; - range.baseMipLevel = 0; - range.levelCount = 1; - range.baseArrayLayer = 0; - range.layerCount = 1; + VkImageResolve region = {}; + region.srcSubresource.baseArrayLayer = 0; + region.srcSubresource.mipLevel = 0; + region.srcSubresource.layerCount = 1; - radv_fast_clear_flush_image_inplace(cmd_buffer, - src_iview->image, &range); + radv_decompress_resolve_src(cmd_buffer, src_image, 1, ®ion); } } -- 2.30.2