From: Wonsik Jung Date: Tue, 11 Feb 2020 04:45:03 +0000 (+0000) Subject: Merge "Fix sync issue about window rotation" into devel/master X-Git-Tag: dali_1.5.0~7 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d065d5468240a4af0e189288d4fda71d6850cc6;hp=ba73d31ff2edf8662acfcc9a44f145af07bbadb3;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git Merge "Fix sync issue about window rotation" into devel/master --- diff --git a/dali/internal/adaptor/common/combined-update-render-controller.cpp b/dali/internal/adaptor/common/combined-update-render-controller.cpp index 8be71f8..4b794ce 100644 --- a/dali/internal/adaptor/common/combined-update-render-controller.cpp +++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp @@ -910,7 +910,6 @@ void CombinedUpdateRenderController::PostRenderWaitForCompletion() while( mPostRendering && ! mNewSurface && // We should NOT wait if we're replacing the surface ! mDeletedSurface && // We should NOT wait if we're deleting the surface - ! mSurfaceResized && // We should NOT wait if we're resizing the surface ! mDestroyUpdateRenderThread ) { mUpdateRenderThreadWaitCondition.Wait( lock ); diff --git a/dali/internal/window-system/common/window-render-surface.cpp b/dali/internal/window-system/common/window-render-surface.cpp index 2561bb2..a5402f5 100644 --- a/dali/internal/window-system/common/window-render-surface.cpp +++ b/dali/internal/window-system/common/window-render-surface.cpp @@ -415,7 +415,13 @@ void WindowRenderSurface::PostRender( bool renderToFbo, bool replacingSurface, b { if( !mRotationFinished ) { - DALI_LOG_INFO( gWindowRenderSurfaceLogFilter, Debug::Verbose, "WindowRenderSurface::PostRender: Trigger rotation event\n" ); + if( mThreadSynchronization ) + { + // Enable PostRender flag + mThreadSynchronization->PostRenderStarted(); + } + + DALI_LOG_RELEASE_INFO("WindowRenderSurface::PostRender: Trigger rotation event\n" ); mRotationTrigger->Trigger();