[Tizen] Initialize surface before PreRender

[platform/core/uifw/dali-adaptor.git] / dali / internal / adaptor / common / combined-update-render-controller.cpp

diff --git a/dali/internal/adaptor/common/combined-update-render-controller.cpp b/dali/internal/adaptor/common/combined-update-render-controller.cpp
index a8a1401..3349b76 100644 (file)
--- a/dali/internal/adaptor/common/combined-update-render-controller.cpp
+++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp
@@ -690,8 +690,6 @@ void CombinedUpdateRenderController::UpdateRenderThread()
           sceneSurfaceResized = scene.IsSurfaceRectChanged();
           windowSurface->SetIsResizing(sceneSurfaceResized);
 
-          windowSurface->InitializeGraphics();
-
           // clear previous frame damaged render items rects, buffer history is tracked on surface level
           mDamagedRects.clear();
 
@@ -703,6 +701,8 @@ void CombinedUpdateRenderController::UpdateRenderThread()
 
           Rect<int> clippingRect; // Empty for fbo rendering
 
+          windowSurface->InitializeGraphics();
+
           // Switch to the context of the surface, merge damaged areas for previous frames
           windowSurface->PreRender(sceneSurfaceResized, mDamagedRects, clippingRect); // Switch GL context
 
@@ -722,7 +722,7 @@ void CombinedUpdateRenderController::UpdateRenderThread()
 
     if(!mUploadWithoutRendering)
     {
-      graphics.ActivateResourceContext();
+      graphics.PostRender();
     }
 
     mCore.PostRender(mUploadWithoutRendering);