projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[Tizen] Add codes for Dali Windows Backend"
[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
a73104a
..
4c7b79f
100644
(file)
--- a/
dali/internal/adaptor/common/combined-update-render-controller.cpp
+++ b/
dali/internal/adaptor/common/combined-update-render-controller.cpp
@@
-469,6
+469,7
@@
void CombinedUpdateRenderController::UpdateRenderThread()
// If the new surface has a different display connection, then the context will be lost
mAdaptorInterfaces.GetDisplayConnectionInterface().Initialize();
// 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();
}
newSurface->ReplaceGraphicsSurface();
SurfaceReplaced();
}
@@
-515,13
+516,15
@@
void CombinedUpdateRenderController::UpdateRenderThread()
}
// Check resize
}
// 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();
{
if( updateStatus.SurfaceRectChanged() )
{
LOG_UPDATE_RENDER_TRACE_FMT( "Resizing Surface" );
SurfaceResized();
+ surfaceResized = true;
}
}
}
}
@@
-544,10
+547,10
@@
void CombinedUpdateRenderController::UpdateRenderThread()
}
}
}
}
-
RenderSurface*
currentSurface = mAdaptorInterfaces.GetRenderSurfaceInterface();
+ currentSurface = mAdaptorInterfaces.GetRenderSurfaceInterface();
if( currentSurface )
{
if( currentSurface )
{
- currentSurface->PreRender(
mS
urfaceResized );
+ currentSurface->PreRender(
s
urfaceResized );
}
Integration::RenderStatus renderStatus;
}
Integration::RenderStatus renderStatus;
@@
-562,7
+565,7
@@
void CombinedUpdateRenderController::UpdateRenderThread()
{
if( currentSurface )
{
{
if( currentSurface )
{
- currentSurface->PostRender( isRenderingToFbo, ( mNewSurface != NULL ),
mS
urfaceResized );
+ currentSurface->PostRender( isRenderingToFbo, ( mNewSurface != NULL ),
s
urfaceResized );
}
}
}
}
@@
-624,6
+627,7
@@
void CombinedUpdateRenderController::UpdateRenderThread()
// Inform core of context destruction & shutdown EGL
mCore.ContextDestroyed();
// Inform core of context destruction & shutdown EGL
mCore.ContextDestroyed();
+ currentSurface = mAdaptorInterfaces.GetRenderSurfaceInterface();
if( currentSurface )
{
currentSurface->DestroySurface();
if( currentSurface )
{
currentSurface->DestroySurface();