From 587e4f679597b05a41accaf8ded36ffbdfcb507b Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 5 Jun 2023 15:01:41 +0100
Subject: [PATCH] Sanitise image layouts in implicit renderpass transitions

---
 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 4a50c38a3..ab99ed572 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_cmd_funcs.cpp
@@ -328,6 +328,11 @@ rdcarray<VkImageMemoryBarrier> WrappedVulkan::GetImplicitRenderPassBarriers(uint
       }
     }
 
+    SanitiseOldImageLayout(barrier.oldLayout);
+    SanitiseNewImageLayout(barrier.newLayout);
+    SanitiseOldImageLayout(barrierStencil.oldLayout);
+    SanitiseNewImageLayout(barrierStencil.newLayout);
+
     // if we support separate depth stencil and the format contains stencil, add barriers
     // separately
     if(SeparateDepthStencil())