X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Frendering%2Fscene-graph-renderer.cpp;h=752a56d3d1adcdfa22e29abbe061a6540f0806a7;hb=73a52536910edf1cbb6ec462217e09a9cbd0449d;hp=476afdf4b3fb11d695b68cfc9224e8487d3b06df;hpb=23a2b8163c01a41b35dfbe8b8d9f2641777a7245;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/update/rendering/scene-graph-renderer.cpp b/dali/internal/update/rendering/scene-graph-renderer.cpp
index 476afdf..752a56d 100644
--- a/dali/internal/update/rendering/scene-graph-renderer.cpp
+++ b/dali/internal/update/rendering/scene-graph-renderer.cpp
@@ -47,7 +47,11 @@ Debug::Filter* gSceneGraphRendererLogFilter = Debug::Filter::New(Debug::NoLoggin
 #endif
 
 // Memory pool used to allocate new renderers. Memory used by this pool will be released when shutting down DALi
-MemoryPoolObjectAllocator<Renderer> gRendererMemoryPool;
+MemoryPoolObjectAllocator<Renderer>& GetRendererMemoryPool()
+{
+  static MemoryPoolObjectAllocator<Renderer> gRendererMemoryPool;
+  return gRendererMemoryPool;
+}
 
 // Flags for re-sending data to renderer.
 enum Flags
@@ -80,8 +84,8 @@ enum Flags
 
 RendererKey Renderer::NewKey()
 {
-  void* ptr = gRendererMemoryPool.AllocateRawThreadSafe();
-  auto  key = gRendererMemoryPool.GetKeyFromPtr(static_cast<Renderer*>(ptr));
+  void* ptr = GetRendererMemoryPool().AllocateRawThreadSafe();
+  auto  key = GetRendererMemoryPool().GetKeyFromPtr(static_cast<Renderer*>(ptr));
   new(ptr) Renderer();
   return RendererKey(key);
 }
@@ -119,22 +123,22 @@ Renderer::~Renderer()
 
 void Renderer::operator delete(void* ptr)
 {
-  gRendererMemoryPool.FreeThreadSafe(static_cast<Renderer*>(ptr));
+  GetRendererMemoryPool().FreeThreadSafe(static_cast<Renderer*>(ptr));
 }
 
 Renderer* Renderer::Get(RendererKey::KeyType rendererKey)
 {
-  return gRendererMemoryPool.GetPtrFromKey(rendererKey);
+  return GetRendererMemoryPool().GetPtrFromKey(rendererKey);
 }
 
 RendererKey Renderer::GetKey(const Renderer& renderer)
 {
-  return RendererKey(gRendererMemoryPool.GetKeyFromPtr(const_cast<Renderer*>(&renderer)));
+  return RendererKey(GetRendererMemoryPool().GetKeyFromPtr(const_cast<Renderer*>(&renderer)));
 }
 
 RendererKey Renderer::GetKey(Renderer* renderer)
 {
-  return RendererKey(gRendererMemoryPool.GetKeyFromPtr(renderer));
+  return RendererKey(GetRendererMemoryPool().GetKeyFromPtr(renderer));
 }
 
 bool Renderer::PrepareRender(BufferIndex updateBufferIndex)
@@ -769,7 +773,7 @@ void Renderer::ResetDirtyFlag()
 
 uint32_t Renderer::GetMemoryPoolCapacity()
 {
-  return gRendererMemoryPool.GetCapacity();
+  return GetRendererMemoryPool().GetCapacity();
 }
 
 void Renderer::OnMappingChanged()