Merge branch 'devel/master' into tizen

[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 a0ca5f5..5af0ca1 100644 (file)
--- a/dali/internal/adaptor/common/combined-update-render-controller.cpp
+++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -40,6 +40,7 @@ namespace Adaptor
 
 namespace
 {
+
 const unsigned int CREATED_THREAD_COUNT = 1u;
 
 const int CONTINUOUS = -1;
@@ -108,7 +109,8 @@ CombinedUpdateRenderController::CombinedUpdateRenderController( AdaptorInternalS
   mUseElapsedTimeAfterWait( FALSE ),
   mNewSurface( NULL ),
   mPostRendering( FALSE ),
-  mSurfaceResized( FALSE )
+  mSurfaceResized( FALSE ),
+  mForceClear( FALSE )
 {
   LOG_EVENT_TRACE;
 
@@ -198,6 +200,7 @@ void CombinedUpdateRenderController::Resume()
     AddPerformanceMarker( PerformanceInterface::RESUME );
 
     mRunning = TRUE;
+    mForceClear = TRUE;
   }
 }
 
@@ -380,6 +383,9 @@ void CombinedUpdateRenderController::UpdateRenderThread()
   // Install a function for logging
   mEnvironmentOptions.InstallLogFunction();
 
+  // Install a function for tracing
+  mEnvironmentOptions.InstallTraceFunction();
+
   LOG_UPDATE_RENDER( "THREAD CREATED" );
 
   mRenderHelper.InitializeEgl();
@@ -504,9 +510,11 @@ void CombinedUpdateRenderController::UpdateRenderThread()
     Integration::RenderStatus renderStatus;
 
     AddPerformanceMarker( PerformanceInterface::RENDER_START );
-    mCore.Render( renderStatus );
+    mCore.Render( renderStatus, mForceClear );
     AddPerformanceMarker( PerformanceInterface::RENDER_END );
 
+    mForceClear = false;
+
     if( renderStatus.NeedsPostRender() )
     {
       mRenderHelper.PostRender( isRenderingToFbo );