A viewport is sometimes changed later because event processing is delayed.
Change a render surface size when the viewport is really changed.
Change-Id: I530a0160669aaae4eb9de05dab2c16f22c0863b1
// to start processing messages for new camera setup etc as soon as possible
ProcessCoreEvents();
// to start processing messages for new camera setup etc as soon as possible
ProcessCoreEvents();
- // this method blocks until the render thread has completed the resizing.
mThreadController->ResizeSurface();
}
mThreadController->ResizeSurface();
}
- LOG_EVENT( "Starting to resize the surface, event-thread blocked" );
+ LOG_EVENT( "Resize the surface" );
- // Start resizing the surface.
{
ConditionalWait::ScopedLock lock( mUpdateRenderThreadWaitCondition );
mPostRendering = FALSE; // Clear the post-rendering flag as Update/Render thread will resize the surface now
mSurfaceResized = TRUE;
mUpdateRenderThreadWaitCondition.Notify( lock );
}
{
ConditionalWait::ScopedLock lock( mUpdateRenderThreadWaitCondition );
mPostRendering = FALSE; // Clear the post-rendering flag as Update/Render thread will resize the surface now
mSurfaceResized = TRUE;
mUpdateRenderThreadWaitCondition.Notify( lock );
}
-
- // Wait until the surface has been resized
- sem_wait( &mEventThreadSemaphore );
-
- LOG_EVENT( "Surface resized, event-thread continuing" );
}
void CombinedUpdateRenderController::SetRenderRefreshRate( unsigned int numberOfFramesPerRender )
}
void CombinedUpdateRenderController::SetRenderRefreshRate( unsigned int numberOfFramesPerRender )
- //////////////////////////////
- // RESIZE SURFACE
- //////////////////////////////
-
const bool isRenderingToFbo = renderToFboEnabled && ( ( 0u == frameCount ) || ( 0u != frameCount % renderToFboInterval ) );
++frameCount;
const bool isRenderingToFbo = renderToFboEnabled && ( ( 0u == frameCount ) || ( 0u != frameCount % renderToFboInterval ) );
++frameCount;
- // The resizing will be applied in the next loop
- bool surfaceResized = ShouldSurfaceBeResized();
- if( DALI_UNLIKELY( surfaceResized ) )
- {
- LOG_UPDATE_RENDER_TRACE_FMT( "Resizing Surface" );
- mRenderHelper.ResizeSurface();
- SurfaceResized();
- }
-
//////////////////////////////
// UPDATE
//////////////////////////////
//////////////////////////////
// UPDATE
//////////////////////////////
LOG_UPDATE_RENDER( "Notification Triggered" );
}
LOG_UPDATE_RENDER( "Notification Triggered" );
}
+ // Check resize
+ bool surfaceResized = ShouldSurfaceBeResized();
+ if( DALI_UNLIKELY( surfaceResized ) )
+ {
+ // RenderHelper::ResizeSurface() should be called right after a viewport is changed.
+ if( updateStatus.SurfaceRectChanged() )
+ {
+ LOG_UPDATE_RENDER_TRACE_FMT( "Resizing Surface" );
+ mRenderHelper.ResizeSurface();
+ SurfaceResized();
+ }
+ }
+
// Optional logging of update/render status
mUpdateStatusLogger.Log( keepUpdatingStatus );
// Optional logging of update/render status
mUpdateStatusLogger.Log( keepUpdatingStatus );
bool CombinedUpdateRenderController::ShouldSurfaceBeResized()
{
ConditionalWait::ScopedLock lock( mUpdateRenderThreadWaitCondition );
bool CombinedUpdateRenderController::ShouldSurfaceBeResized()
{
ConditionalWait::ScopedLock lock( mUpdateRenderThreadWaitCondition );
-
- bool surfaceSized = mSurfaceResized;
- mSurfaceResized = FALSE;
-
- return surfaceSized;
+ return mSurfaceResized;
}
void CombinedUpdateRenderController::SurfaceResized()
{
}
void CombinedUpdateRenderController::SurfaceResized()
{
- // Just increment the semaphore
- sem_post( &mEventThreadSemaphore );
+ ConditionalWait::ScopedLock lock( mUpdateRenderThreadWaitCondition );
+ mSurfaceResized = FALSE;
}
///////////////////////////////////////////////////////////////////////////////////////////////////
}
///////////////////////////////////////////////////////////////////////////////////////////////////