Destroy Render::Texture after OnRenderFinished

Since we can call OnRenderFinished even if this Render::Texture destroyed,
Let we keep alive until OnRenderFinished callback called.

Change-Id: Ia67a554fb8e98b5b4e1da6055bcdbc9058a5eb5d
Signed-off-by: Eunki, Hong <eunkiki.hong@samsung.com>

diff --git a/dali/internal/render/common/render-manager.cpp b/dali/internal/render/common/render-manager.cpp
index 7907982..b0198a3 100644 (file)
--- a/dali/internal/render/common/render-manager.cpp
+++ b/dali/internal/render/common/render-manager.cpp
@@ -192,6 +192,8 @@ struct RenderManager::Impl
 
   OrderedSet<Render::RenderTracker> mRenderTrackers; ///< List of owned render trackers
 
+  OwnerKeyContainer<Render::Texture> textureDiscardQueue;  ///< Discarded textures
+
   ProgramController   programController; ///< Owner of the programs
   Render::ShaderCache shaderCache;       ///< The cache for the graphics shaders
 
@@ -286,8 +288,8 @@ void RenderManager::RemoveTexture(const Render::TextureKey& textureKey)
 
   if(iter != mImpl->textureContainer.End())
   {
-    textureKey->Destroy();
-    mImpl->textureContainer.Erase(iter); // Texture found; now destroy it
+    // Transfer ownership to the discard queue, this keeps the object alive, until the render-thread has finished with it
+    mImpl->textureDiscardQueue.PushBack(mImpl->textureContainer.Release(iter));
   }
 }
 
@@ -1116,6 +1118,13 @@ void RenderManager::PostRender()
   }
   mImpl->updatedTextures.Clear();
 
+  // Remove discarded textures after OnRenderFinished called
+  for(auto& iter : mImpl->textureDiscardQueue)
+  {
+    iter->Destroy();
+  }
+  mImpl->textureDiscardQueue.Clear();
+
   mImpl->UpdateTrackers();
 
   uint32_t count = 0u;