Fixed issue with the last reference to TextureAtlasSuballocation and BufferSuballocation

2 files changed, 24 insertions, 0 deletions

diff --git a/Graphics/GraphicsTools/src/BufferSuballocator.cpp b/Graphics/GraphicsTools/src/BufferSuballocator.cpp
index 5f1f5cfd..7f59edcd 100644
--- a/Graphics/GraphicsTools/src/BufferSuballocator.cpp
+++ b/Graphics/GraphicsTools/src/BufferSuballocator.cpp
@@ -68,6 +68,18 @@ public:
 
     IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_BufferSuballocation, TBase)
 
+    virtual Atomics::Long DILIGENT_CALL_TYPE Release() override final
+    {
+        RefCntAutoPtr<BufferSuballocatorImpl> pParent;
+        return TBase::Release(
+            [&]() //
+            {
+                // We must keep parent alive while the object is being destroyed because
+                // it keeps the object allocator.
+                pParent = m_pParentAllocator;
+            });
+    }
+
     virtual Uint32 GetOffset() const override final
     {
         return m_Offset;
diff --git a/Graphics/GraphicsTools/src/DynamicTextureAtlas.cpp b/Graphics/GraphicsTools/src/DynamicTextureAtlas.cpp
index 2c5fcc2a..6881decf 100644
--- a/Graphics/GraphicsTools/src/DynamicTextureAtlas.cpp
+++ b/Graphics/GraphicsTools/src/DynamicTextureAtlas.cpp
@@ -69,6 +69,18 @@ public:
 
     IMPLEMENT_QUERY_INTERFACE_IN_PLACE(IID_TextureAtlasSuballocation, TBase)
 
+    virtual Atomics::Long DILIGENT_CALL_TYPE Release() override final
+    {
+        RefCntAutoPtr<DynamicTextureAtlasImpl> pAtlas;
+        return TBase::Release(
+            [&]() //
+            {
+                // We must keep the atlas alive while the object is being destroyed because
+                // the atlas keeps the object allocator.
+                pAtlas = m_pParentAtlas;
+            });
+    }
+
     virtual uint2 GetOrigin() const override final;
 
     virtual Uint32 GetSlice() const override final