From 8fa5a71c2c3b4a7d6f4798da2039b27522d2b5c8 Mon Sep 17 00:00:00 2001
From: baldurk <baldurk@baldurk.org>
Date: Thu, 13 Feb 2025 23:53:38 +0000
Subject: [PATCH] Add missing lock around forced references removal

---
 .../driver/vulkan/wrappers/vk_misc_funcs.cpp   | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
index bf9152498..931c127e7 100644
--- a/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
+++ b/renderdoc/driver/vulkan/wrappers/vk_misc_funcs.cpp
@@ -156,6 +156,18 @@ static void MakeSubpassLoadRP(RPCreateInfo &info, const RPCreateInfo *origInfo,
   }
 }
 
+template <typename type>
+bool RemoveForcedRef()
+{
+  return false;
+}
+
+template <>
+bool RemoveForcedRef<VkAccelerationStructureKHR>()
+{
+  return true;
+}
+
 // note, for threading reasons we ensure to release the wrappers before
 // releasing the underlying object. Otherwise after releasing the vulkan object
 // that same handle could be returned by create on another thread, and we
@@ -166,7 +178,11 @@ static void MakeSubpassLoadRP(RPCreateInfo &info, const RPCreateInfo *origInfo,
     if(obj == VK_NULL_HANDLE)                                                            \
       return;                                                                            \
     type unwrappedObj = Unwrap(obj);                                                     \
-    m_ForcedReferences.removeOne(GetRecord(obj));                                        \
+    if(RemoveForcedRef<type>())                                                          \
+    {                                                                                    \
+      SCOPED_LOCK(m_ForcedReferencesLock);                                               \
+      m_ForcedReferences.removeOne(GetRecord(obj));                                      \
+    }                                                                                    \
     if(IsReplayMode(m_State))                                                            \
       m_CreationInfo.erase(GetResID(obj));                                               \
     GetResourceManager()->ReleaseWrappedResource(obj, true);                             \