X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fadaptor%2Fcommon%2Fcombined-update-render-controller.cpp;h=4c7b79f43b37620d7044703979617e23238daf9b;hb=8ef607fbaa1d6568f765ff1e1d7b30bb8f7d22cb;hp=84fa525537b37754f070a2ce7cc6fb0ef6e12424;hpb=d0729ba1475eb2f9a0d1d7b09ae0f5192c2f03f0;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 old mode 100755 new mode 100644 index 84fa525..4c7b79f --- a/dali/internal/adaptor/common/combined-update-render-controller.cpp +++ b/dali/internal/adaptor/common/combined-update-render-controller.cpp @@ -28,9 +28,7 @@ #include #include #include -#if defined(__GNUC__) #include -#endif namespace Dali { @@ -399,9 +397,7 @@ void CombinedUpdateRenderController::ProcessSleepRequest() void CombinedUpdateRenderController::UpdateRenderThread() { -#if defined(__GNUC__) SetThreadName("RenderThread\0"); -#endif // Install a function for logging mEnvironmentOptions.InstallLogFunction(); @@ -473,6 +469,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(); } @@ -550,7 +547,7 @@ void CombinedUpdateRenderController::UpdateRenderThread() } } - RenderSurface* currentSurface = mAdaptorInterfaces.GetRenderSurfaceInterface(); + currentSurface = mAdaptorInterfaces.GetRenderSurfaceInterface(); if( currentSurface ) { currentSurface->PreRender( surfaceResized ); @@ -630,6 +627,7 @@ void CombinedUpdateRenderController::UpdateRenderThread() // Inform core of context destruction & shutdown EGL mCore.ContextDestroyed(); + currentSurface = mAdaptorInterfaces.GetRenderSurfaceInterface(); if( currentSurface ) { currentSurface->DestroySurface();