From 57edff9f9e779fbd4c02823948b656ec9ed2cf83 Mon Sep 17 00:00:00 2001 From: baldurk Date: Wed, 28 Apr 2021 16:29:56 +0100 Subject: [PATCH] Transition pixel history image to layout matching the current renderpass --- renderdoc/driver/vulkan/vk_pixelhistory.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/renderdoc/driver/vulkan/vk_pixelhistory.cpp b/renderdoc/driver/vulkan/vk_pixelhistory.cpp index b51f8438d..d4b8730d3 100644 --- a/renderdoc/driver/vulkan/vk_pixelhistory.cpp +++ b/renderdoc/driver/vulkan/vk_pixelhistory.cpp @@ -2360,6 +2360,14 @@ struct VulkanPixelHistoryPerFragmentCallback : VulkanPixelHistoryCallback barrier.newLayout = VK_IMAGE_LAYOUT_DEPTH_STENCIL_ATTACHMENT_OPTIMAL; DoPipelineBarrier(cmd, 1, &barrier); + barrier.image = Unwrap(colourCopyParams.srcImage); + barrier.subresourceRange.aspectMask = VK_IMAGE_ASPECT_COLOR_BIT; + barrier.srcAccessMask = VK_ACCESS_ALL_WRITE_BITS; + barrier.dstAccessMask = VK_ACCESS_COLOR_ATTACHMENT_WRITE_BIT; + barrier.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED; + barrier.newLayout = colourCopyParams.srcImageLayout; + DoPipelineBarrier(cmd, 1, &barrier); + m_pDriver->GetCmdRenderState().graphics.pipeline = GetResID(pipesIter[i]); m_pDriver->GetCmdRenderState().BeginRenderPassAndApplyState(