X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fadaptor%2Fcommon%2Fcombined-update-render-controller.cpp;h=5ae0eccd721867a9ce2b7f3fa81ab0ff7de5ab11;hb=56fe2ff219abb4c0db738735d536c4dbe049bddd;hp=6ccd40e8469ce9d01a1d8b97500fb48f72189813;hpb=88b75de97d46eeec9ec8b533cfb3c8e02d6c1253;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/internal/adaptor/common/combined-update-render-controller.cpp b/dali/internal/adaptor/common/combined-update-render-controller.cpp index 6ccd40e..5ae0ecc 100755 --- a/dali/internal/adaptor/common/combined-update-render-controller.cpp +++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp @@ -473,6 +473,7 @@ void CombinedUpdateRenderController::UpdateRenderThread() // If the new surface has a different display connection, then the context will be lost mAdaptorInterfaces.GetDisplayConnectionInterface().Initialize(); + newSurface->InitializeGraphics( mAdaptorInterfaces.GetGraphicsInterface(), mAdaptorInterfaces.GetDisplayConnectionInterface() ); newSurface->ReplaceGraphicsSurface(); SurfaceReplaced(); } @@ -519,13 +520,15 @@ void CombinedUpdateRenderController::UpdateRenderThread() } // Check resize - bool surfaceResized = ShouldSurfaceBeResized(); - if( DALI_UNLIKELY( surfaceResized ) ) + bool surfaceResized = false; + bool shouldSurfaceBeResized = ShouldSurfaceBeResized(); + if( DALI_UNLIKELY( shouldSurfaceBeResized ) ) { if( updateStatus.SurfaceRectChanged() ) { LOG_UPDATE_RENDER_TRACE_FMT( "Resizing Surface" ); SurfaceResized(); + surfaceResized = true; } } @@ -548,10 +551,10 @@ void CombinedUpdateRenderController::UpdateRenderThread() } } - RenderSurface* currentSurface = mAdaptorInterfaces.GetRenderSurfaceInterface(); + currentSurface = mAdaptorInterfaces.GetRenderSurfaceInterface(); if( currentSurface ) { - currentSurface->PreRender( mSurfaceResized ); + currentSurface->PreRender( surfaceResized ); } Integration::RenderStatus renderStatus; @@ -566,7 +569,7 @@ void CombinedUpdateRenderController::UpdateRenderThread() { if( currentSurface ) { - currentSurface->PostRender( isRenderingToFbo, ( mNewSurface != NULL ), mSurfaceResized ); + currentSurface->PostRender( isRenderingToFbo, ( mNewSurface != NULL ), surfaceResized ); } } @@ -628,6 +631,7 @@ void CombinedUpdateRenderController::UpdateRenderThread() // Inform core of context destruction & shutdown EGL mCore.ContextDestroyed(); + currentSurface = mAdaptorInterfaces.GetRenderSurfaceInterface(); if( currentSurface ) { currentSurface->DestroySurface();