Fix memory leak issue due to timing

Since thread timing issue, it is possible that DiscardResourceId
before CreateResourceId.

Since it is hard to resolve timing issue, let we just upload texture
after event message flushed.

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

diff --git a/dali/internal/adaptor/common/combined-update-render-controller.cpp b/dali/internal/adaptor/common/combined-update-render-controller.cpp
index 0f0b98e..648ef81 100644 (file)
--- a/dali/internal/adaptor/common/combined-update-render-controller.cpp
+++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp
@@ -601,7 +601,7 @@ void CombinedUpdateRenderController::UpdateRenderThread()
     }
 
     //////////////////////////////
-    // TextureUploadRequest
+    // TextureUploadRequest (phase #1)
     //////////////////////////////
 
     // Upload requested resources after resource context activated.
@@ -686,8 +686,16 @@ void CombinedUpdateRenderController::UpdateRenderThread()
       }
     }
 
+    //////////////////////////////
+    // TextureUploadRequest (phase #2)
+    //////////////////////////////
+
+    // Upload requested resources after resource context activated.
     graphics.ActivateResourceContext();
 
+    // Since uploadOnly value used at Update side, we should not change uploadOnly value now even some textures are uploaded.
+    mTextureUploadManager.ResourceUpload();
+
     if(mFirstFrameAfterResume)
     {
       // mFirstFrameAfterResume is set to true when the thread is resumed