Fix for shared handles for pool deleter

KhronosGroup · Jul 22, 2024 · 5f79a12 · 5f79a12
1 parent 77f6a63
commit 5f79a12
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/snippets/SharedDestroy.hpp b/snippets/SharedDestroy.hpp
@@ -135,8 +135,8 @@ class PoolFreeShared
 public:
   void destroy( DestructorType parent, HandleType handle ) const VULKAN_HPP_NOEXCEPT
   {
-    VULKAN_HPP_ASSERT( m_destroy && m_dispatch );
-    ( parent.*m_destroy )( m_pool.get(), 1u, &handle, *m_dispatch );
+    if( m_destroy && m_dispatch && m_pool )
+      ( parent.*m_destroy )( m_pool.get(), 1u, &handle, *m_dispatch );
   }
 
 private:

diff --git a/vulkan/vulkan_shared.hpp b/vulkan/vulkan_shared.hpp
@@ -409,8 +409,8 @@ namespace VULKAN_HPP_NAMESPACE
   public:
     void destroy( DestructorType parent, HandleType handle ) const VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_ASSERT( m_destroy && m_dispatch );
-      ( parent.*m_destroy )( m_pool.get(), 1u, &handle, *m_dispatch );
+      if ( m_destroy && m_dispatch && m_pool )
+        ( parent.*m_destroy )( m_pool.get(), 1u, &handle, *m_dispatch );
     }
 
   private:

diff --git a/vulkan/vulkansc_shared.hpp b/vulkan/vulkansc_shared.hpp
@@ -346,8 +346,8 @@ namespace VULKAN_HPP_NAMESPACE
   public:
     void destroy( DestructorType parent, HandleType handle ) const VULKAN_HPP_NOEXCEPT
     {
-      VULKAN_HPP_ASSERT( m_destroy && m_dispatch );
-      ( parent.*m_destroy )( handle, m_allocationCallbacks, *m_dispatch );
+      if ( m_destroy && m_dispatch )
+        ( parent.*m_destroy )( handle, m_allocationCallbacks, *m_dispatch );
     }
 
   private: