Don't modify command buffer loose events when adding them via submit

Zorro666 · Zorro666 · commit 93fc846cb2f6 · 2026-04-21T10:39:23.000+01:00
The command buffer might be submitted multiple times
diff --git a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
@@ -351,16 +351,14 @@ void WrappedVulkan::ReplayQueueSubmit(VkQueue queue, VkSubmitInfo2 submitInfo, r
 
       {
         // pull in any remaining events on the command buffer that weren't added to an action
-        uint32_t i = 0;
-        for(APIEvent &apievent : cmdBufInfo.curEvents)
+        for(const APIEvent &event : cmdBufInfo.curEvents)
         {
+          APIEvent apievent(event);
           apievent.eventId += m_RootEventID;
 
           m_RootEvents.push_back(apievent);
           m_Events.resize(apievent.eventId + 1);
           m_Events[apievent.eventId] = apievent;
-
-          i++;
         }
 
         for(auto it = cmdBufInfo.resourceUsage.begin(); it != cmdBufInfo.resourceUsage.end(); ++it)

Original file line number	Diff line number	Diff line change
`@@ -351,16 +351,14 @@ void WrappedVulkan::ReplayQueueSubmit(VkQueue queue, VkSubmitInfo2 submitInfo, r`
`351`	`351`
`352`	`352`	`{`
`353`	`353`	`// pull in any remaining events on the command buffer that weren't added to an action`
`354`		`- uint32_t i = 0;`
`355`		`- for(APIEvent &apievent : cmdBufInfo.curEvents)`
	`354`	`+ for(const APIEvent &event : cmdBufInfo.curEvents)`
`356`	`355`	`{`
	`356`	`+ APIEvent apievent(event);`
`357`	`357`	`apievent.eventId += m_RootEventID;`
`358`	`358`
`359`	`359`	`m_RootEvents.push_back(apievent);`
`360`	`360`	`m_Events.resize(apievent.eventId + 1);`
`361`	`361`	`m_Events[apievent.eventId] = apievent;`
`362`		`-`
`363`		`- i++;`
`364`	`362`	`}`
`365`	`363`
`366`	`364`	`for(auto it = cmdBufInfo.resourceUsage.begin(); it != cmdBufInfo.resourceUsage.end(); ++it)`