From 082402ed66497f75ff8a64f2fed7b20302b43935 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 15 Jun 2023 11:25:57 +0100
Subject: [PATCH] Delete AMD action callbacks if multiple passes happen. Closes
 #2958

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

diff --git a/renderdoc/driver/vulkan/vk_counters.cpp b/renderdoc/driver/vulkan/vk_counters.cpp
index 1ec048a07..9282bfaf9 100644
--- a/renderdoc/driver/vulkan/vk_counters.cpp
+++ b/renderdoc/driver/vulkan/vk_counters.cpp
@@ -456,6 +456,8 @@ void VulkanReplay::FillTimersAMD(uint32_t *eventStartID, uint32_t *sampleIndex,
 {
   uint32_t maxEID = m_pDriver->GetMaxEID();
 
+  RDCASSERT(m_pAMDActionCallback == NULL);
+
   m_pAMDActionCallback = new VulkanAMDActionCallback(m_pDriver, this, *sampleIndex, *eventIDs);
 
   // replay the events to perform all the queries
@@ -502,8 +504,13 @@ rdcarray<CounterResult> VulkanReplay::FetchCountersAMD(const rdcarray<GPUCounter
 
     eventIDs.clear();
 
+    // delete any callback from a previous pass, we only use it for EID aliasing
+    SAFE_DELETE(m_pAMDActionCallback);
+
     FillTimersAMD(&eventStartID, &sampleIndex, &eventIDs);
 
+    // leave this one alive, it will be deleted below
+
     m_pAMDCounters->EndPass();
   }