Merge branch 'devel/master' into tizen

diff --git a/dali/internal/adaptor/common/combined-update-render-controller.cpp b/dali/internal/adaptor/common/combined-update-render-controller.cpp
index f0a5e65..8aac435 100644 (file)
--- a/dali/internal/adaptor/common/combined-update-render-controller.cpp
+++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp
@@ -116,7 +116,8 @@ CombinedUpdateRenderController::CombinedUpdateRenderController( AdaptorInternalS
   mPostRendering( FALSE ),
   mSurfaceResized( FALSE ),
   mForceClear( FALSE ),
-  mUploadWithoutRendering( FALSE )
+  mUploadWithoutRendering( FALSE ),
+  mFirstFrameAfterResume( FALSE )
 {
   LOG_EVENT_TRACE;
 
@@ -216,6 +217,7 @@ void CombinedUpdateRenderController::Resume()
 
     mRunning = TRUE;
     mForceClear = TRUE;
+    mFirstFrameAfterResume = TRUE;
 
     DALI_LOG_RELEASE_INFO( "CombinedUpdateRenderController::Resume\n" );
   }
@@ -635,11 +637,12 @@ void CombinedUpdateRenderController::UpdateRenderThread()
       eglImpl.MakeContextCurrent( EGL_NO_SURFACE, eglImpl.GetContext() );
     }
 
-    if( timeToSleepUntil == 0 )
+    if( mFirstFrameAfterResume )
     {
-      // timeToSleepUntil is set to 0 when the thread is initalized or resumed
+      // mFirstFrameAfterResume is set to true when the thread is resumed
       // Let eglImplementation know the first frame after thread initialized or resumed.
       eglImpl.SetFirstFrameAfterResume();
+      mFirstFrameAfterResume = FALSE;
     }
 
     Integration::RenderStatus renderStatus;

diff --git a/dali/internal/adaptor/common/combined-update-render-controller.h b/dali/internal/adaptor/common/combined-update-render-controller.h
index e83bacb..cfcb25b 100644 (file)
--- a/dali/internal/adaptor/common/combined-update-render-controller.h
+++ b/dali/internal/adaptor/common/combined-update-render-controller.h
@@ -370,6 +370,8 @@ private:
   volatile unsigned int             mForceClear;                       ///< Will be set to clear forcibly
 
   volatile unsigned int             mUploadWithoutRendering;           ///< Will be set to upload the resource only (with no rendering)
+
+  volatile unsigned int             mFirstFrameAfterResume;            ///< Will be set to check the first frame after resume (for log)
 };
 
 } // namespace Adaptor

diff --git a/dali/public-api/dali-adaptor-version.cpp b/dali/public-api/dali-adaptor-version.cpp
index a1dd7e4..494cfc5 100644 (file)
--- a/dali/public-api/dali-adaptor-version.cpp
+++ b/dali/public-api/dali-adaptor-version.cpp
@@ -28,7 +28,7 @@ namespace Dali
 
 const unsigned int ADAPTOR_MAJOR_VERSION = 1;
 const unsigned int ADAPTOR_MINOR_VERSION = 4;
-const unsigned int ADAPTOR_MICRO_VERSION = 39;
+const unsigned int ADAPTOR_MICRO_VERSION = 40;
 const char * const ADAPTOR_BUILD_DATE    = __DATE__ " " __TIME__;
 
 #ifdef DEBUG_ENABLED

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index e24ead7..4a9b453 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -17,7 +17,7 @@
 
 Name:       dali-adaptor
 Summary:    The DALi Tizen Adaptor
-Version:    1.4.39
+Version:    1.4.40
 Release:    1
 Group:      System/Libraries
 License:    Apache-2.0 and BSD-3-Clause and MIT