From 0842e50cb10201fd8f0c2da557396eb072c66cf5 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 3 Jun 2019 14:13:39 +0100
Subject: [PATCH] Don't transition to UNDEFINED if undoing implicit barriers.
 Closes #1394

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

diff --git a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
index cfc80b481..b7f79fd84 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
@@ -998,7 +998,8 @@ bool WrappedVulkan::Serialise_vkEndCommandBuffer(SerialiserType &ser, VkCommandB
 
             barrier.subresourceRange = it->second.subresourceRange;
 
-            if(barrier.oldLayout != barrier.newLayout)
+            if(barrier.oldLayout != barrier.newLayout &&
+               barrier.newLayout != VK_IMAGE_LAYOUT_UNDEFINED)
               revertBarriers.push_back(barrier);
           }