From f3a3d0ac58eeb57d65fabe9245297f7e97b1a51c Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Fri, 8 Dec 2023 13:34:54 +0000
Subject: [PATCH] Update image states after frame references to handle
 postponed resources

* We may fetch initial states for postponed resources when updating references,
  so don't update image states until after as the fetch is performed *before*
  the application's commands
---
 renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
index e9a2d2628..ff17ba4d0 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
@@ -1102,6 +1102,10 @@ void WrappedVulkan::CaptureQueueSubmit(VkQueue queue,
     {
       (*it)->AddResourceReferences(GetResourceManager());
       GetResourceManager()->MergeReferencedMemory((*it)->cmdInfo->memFrameRefs);
+    }
+
+    for(auto it = cmdsWithReferences.begin(); it != cmdsWithReferences.end(); ++it)
+    {
       UpdateImageStates((*it)->cmdInfo->imageStates);
     }