From a38ab1b0d335b27aaf4ee1d4e24ca2c41c3d4e55 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 12 Aug 2021 14:11:43 +0100
Subject: [PATCH] Handle conservatively marked storage images in assert

---
 renderdoc/driver/vulkan/vk_manager.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/renderdoc/driver/vulkan/vk_manager.cpp b/renderdoc/driver/vulkan/vk_manager.cpp
index b1b868036..a605af904 100644
--- a/renderdoc/driver/vulkan/vk_manager.cpp
+++ b/renderdoc/driver/vulkan/vk_manager.cpp
@@ -411,6 +411,9 @@ void VulkanResourceManager::SerialiseImageStates(SerialiserType &ser,
             auto currentSub = current->subresourceStates.SubresourceIndexValue(
                 aspectIndex, subit->range().baseMipLevel, subit->range().baseArrayLayer,
                 subit->range().baseDepthSlice);
+            FrameRefType expectedRef = subit->state().refType;
+            if(current->m_Storage)
+              expectedRef = eFrameRef_ReadBeforeWrite;
             RDCASSERT(currentSub.refType == subit->state().refType ||
                       subit->state().refType == eFrameRef_Unknown);
             RDCASSERT(currentSub.oldLayout == subit->state().oldLayout ||