From 9ee529e435af0c4749e6cdf0ae80410d844f648b Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Tue, 23 Feb 2016 21:19:28 +0100
Subject: [PATCH] Call ReplacePresentableImageLayout earlier on initial
 layouts. Refs #185

---
 renderdoc/driver/vulkan/vk_core.cpp    | 2 --
 renderdoc/driver/vulkan/vk_manager.cpp | 1 +
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/renderdoc/driver/vulkan/vk_core.cpp b/renderdoc/driver/vulkan/vk_core.cpp
index 82065e7ef..7c2960afd 100644
--- a/renderdoc/driver/vulkan/vk_core.cpp
+++ b/renderdoc/driver/vulkan/vk_core.cpp
@@ -663,8 +663,6 @@ bool WrappedVulkan::Serialise_BeginCaptureFrame(bool applyInitialState)
 		{
 			for(size_t i=0; i < imgBarriers.size(); i++)
 			{
-				ReplacePresentableImageLayout(imgBarriers[i].oldLayout);
-				ReplacePresentableImageLayout(imgBarriers[i].newLayout);
 				imgBarriers[i].srcAccessMask = MakeAccessMask(imgBarriers[i].oldLayout);
 				imgBarriers[i].dstAccessMask = MakeAccessMask(imgBarriers[i].newLayout);
 			}
diff --git a/renderdoc/driver/vulkan/vk_manager.cpp b/renderdoc/driver/vulkan/vk_manager.cpp
index 7eb9bc103..93321b9cb 100644
--- a/renderdoc/driver/vulkan/vk_manager.cpp
+++ b/renderdoc/driver/vulkan/vk_manager.cpp
@@ -256,6 +256,7 @@ void VulkanResourceManager::SerialiseImageStates(map<ResourceId, ImageLayouts> &
 				t.dstQueueFamilyIndex = VK_QUEUE_FAMILY_IGNORED;
 				t.image = Unwrap(GetCurrentHandle<VkImage>(liveid));
 				t.oldLayout = VK_IMAGE_LAYOUT_UNDEFINED;
+				ReplacePresentableImageLayout(state.newLayout);
 				t.newLayout = state.newLayout;
 				t.subresourceRange = state.subresourceRange;
 				barriers.push_back(t);