From 6eab349dd55fefc248d41d4570771778f11357d0 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Mon, 8 Feb 2021 13:49:13 +0000
Subject: [PATCH] Fix event counting leading to mismatches in vulkan captures

---
 renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
index 47b2e5ff3..ea91300b4 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_queue_funcs.cpp
@@ -333,7 +333,6 @@ bool WrappedVulkan::Serialise_vkQueueSubmit(SerialiserType &ser, VkQueue queue,
             for(APIEvent &apievent : cmdBufInfo.curEvents)
             {
               apievent.eventId = m_RootEventID - cmdBufInfo.curEvents.count() + i;
-              cmdBufInfo.eventCount++;
 
               m_RootEvents.push_back(apievent);
               m_Events.resize(apievent.eventId + 1);
@@ -1658,16 +1657,11 @@ bool WrappedVulkan::Serialise_vkQueueBeginDebugUtilsLabelEXT(SerialiserType &ser
       draw.markerColor.w = RDCCLAMP(Label.color[3], 0.0f, 1.0f);
 
       AddEvent();
-      m_RootEventID++;
       AddDrawcall(draw, false);
 
       // now push the drawcall stack
       GetDrawcallStack().push_back(&GetDrawcallStack().back()->children.back());
     }
-    else
-    {
-      m_RootEventID++;
-    }
   }
 
   return true;