From 28e4660ffee8e160fbc8f14d3e17f78a62d5fc68 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 10 Jun 2019 14:38:23 +0100
Subject: [PATCH] Sanitise image layouts for revert of partial renderpass
 layout changes

---
 renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
index de7087bae..ed633e59b 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
@@ -997,7 +997,12 @@ bool WrappedVulkan::Serialise_vkEndCommandBuffer(SerialiserType &ser, VkCommandB
 
             if(barrier.oldLayout != barrier.newLayout &&
                barrier.newLayout != VK_IMAGE_LAYOUT_UNDEFINED)
+            {
+              SanitiseOldImageLayout(barrier.oldLayout);
+              SanitiseNewImageLayout(barrier.newLayout);
+
               revertBarriers.push_back(barrier);
+            }
           }
 
           if(!revertBarriers.empty())