[Vk] VulkanDeviceResource derived classes are sometimes created on ot…

…her threads, so registration should be protected by mutex, recursive as notifyResourceDestroyed() can happen inside notifyDeviceLost()
OGRECave · Dec 6, 2024 · e0846af · e0846af
1 parent 1dc278a
commit e0846af
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/RenderSystems/Vulkan/include/OgreVulkanDeviceResource.h b/RenderSystems/Vulkan/include/OgreVulkanDeviceResource.h
@@ -30,6 +30,7 @@ THE SOFTWARE.
 
 #include "OgreVulkanPrerequisites.h"
 
+#include <mutex>
 #include "ogrestd/vector.h"
 
 namespace Ogre
@@ -73,6 +74,7 @@ namespace Ogre
         ~VulkanDeviceResourceManager();  // protected and non-virtual
 
     private:
+        std::recursive_mutex mResourcesMutex;
         vector<VulkanDeviceResource *>::type mResources, mResourcesCopy;
     };
 

diff --git a/RenderSystems/Vulkan/src/OgreVulkanDeviceResource.cpp b/RenderSystems/Vulkan/src/OgreVulkanDeviceResource.cpp
@@ -64,12 +64,16 @@ namespace Ogre
 
     void VulkanDeviceResourceManager::notifyResourceCreated( VulkanDeviceResource *deviceResource )
     {
+        std::lock_guard<std::recursive_mutex> guard(mResourcesMutex);
+
         assert( std::find( mResources.begin(), mResources.end(), deviceResource ) == mResources.end() );
         mResources.push_back( deviceResource );
     }
 
     void VulkanDeviceResourceManager::notifyResourceDestroyed( VulkanDeviceResource *deviceResource )
     {
+        std::lock_guard<std::recursive_mutex> guard(mResourcesMutex);
+
         vector<VulkanDeviceResource *>::type::iterator it =
             std::find( mResources.begin(), mResources.end(), deviceResource );
         assert( it != mResources.end() );
@@ -83,6 +87,8 @@ namespace Ogre
 
     void VulkanDeviceResourceManager::notifyDeviceLost()
     {
+        std::lock_guard<std::recursive_mutex> guard(mResourcesMutex);
+
         assert( mResourcesCopy.empty() );  // reentrancy is not expected nor supported
         mResourcesCopy = mResources;
 
@@ -99,6 +105,8 @@ namespace Ogre
 
     void VulkanDeviceResourceManager::notifyDeviceRestored()
     {
+        std::lock_guard<std::recursive_mutex> guard(mResourcesMutex);
+
         assert( mResourcesCopy.empty() );  // reentrancy is not expected nor supported
         mResourcesCopy = mResources;
         for( unsigned pass = 0; pass < 2; ++pass )