From 09519c802f47dcb3a8756c99dae785bd3de7de99 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Wed, 4 May 2022 10:59:34 +0100
Subject: [PATCH] Add usage from trailing events in command buffers

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

diff --git a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
index 4c1b896c0..5220c018c 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
@@ -331,6 +331,14 @@ void WrappedVulkan::ReplayQueueSubmit(VkQueue queue, VkSubmitInfo2 submitInfo, r
           i++;
         }
 
+        for(auto it = cmdBufInfo.resourceUsage.begin(); it != cmdBufInfo.resourceUsage.end(); ++it)
+        {
+          EventUsage u = it->second;
+          u.eventId += m_RootEventID - cmdBufInfo.curEvents.count();
+          m_ResourceUses[it->first].push_back(u);
+          m_EventFlags[u.eventId] |= PipeRWUsageEventFlags(u.usage);
+        }
+
         name = StringFormat::Fmt("=> %s[%u]: vkEndCommandBuffer(%s)", basename.c_str(), c,
                                  ToStr(cmd).c_str());
         action.customName = name;