mColorDepth( isTransparent ? COLOR_DEPTH_32 : COLOR_DEPTH_24 ),
mOutputTransformedSignal(),
mFrameCallbackInfoContainer(),
+ mMutex(),
mRotationAngle( 0 ),
mScreenRotationAngle( 0 ),
mOwnSurface( false ),
{
Dali::Integration::Scene::FrameCallbackContainer callbacks;
- if( mScene )
+ Dali::Integration::Scene scene = mScene.GetHandle();
+ if( scene )
{
- mScene->GetFrameRenderedCallback( callbacks );
+ bool needFrameRenderedTrigger = false;
+
+ scene.GetFrameRenderedCallback( callbacks );
if( !callbacks.empty() )
{
int frameRenderedSync = mWindowBase->CreateFrameRenderedSyncFence();
if( frameRenderedSync != -1 )
{
+ Dali::Mutex::ScopedLock lock( mMutex );
+
DALI_LOG_INFO( gWindowRenderSurfaceLogFilter, Debug::Verbose, "WindowRenderSurface::PreRender: CreateFrameRenderedSyncFence [%d]\n", frameRenderedSync );
mFrameCallbackInfoContainer.push_back( std::unique_ptr< FrameCallbackInfo >( new FrameCallbackInfo( callbacks, frameRenderedSync ) ) );
- if( !mFrameRenderedTrigger )
- {
- mFrameRenderedTrigger = std::unique_ptr< TriggerEventInterface >( TriggerEventFactory::CreateTriggerEvent( MakeCallback( this, &WindowRenderSurface::ProcessFrameCallback ),
- TriggerEventInterface::KEEP_ALIVE_AFTER_TRIGGER ) );
- }
- mFrameRenderedTrigger->Trigger();
+ needFrameRenderedTrigger = true;
}
else
{
callbacks.clear();
}
- mScene->GetFramePresentedCallback( callbacks );
+ scene.GetFramePresentedCallback( callbacks );
if( !callbacks.empty() )
{
int framePresentedSync = mWindowBase->CreateFramePresentedSyncFence();
if( framePresentedSync != -1 )
{
+ Dali::Mutex::ScopedLock lock( mMutex );
+
DALI_LOG_INFO( gWindowRenderSurfaceLogFilter, Debug::Verbose, "WindowRenderSurface::PreRender: CreateFramePresentedSyncFence [%d]\n", framePresentedSync );
mFrameCallbackInfoContainer.push_back( std::unique_ptr< FrameCallbackInfo >( new FrameCallbackInfo( callbacks, framePresentedSync ) ) );
- if( !mFrameRenderedTrigger )
- {
- mFrameRenderedTrigger = std::unique_ptr< TriggerEventInterface >( TriggerEventFactory::CreateTriggerEvent( MakeCallback( this, &WindowRenderSurface::ProcessFrameCallback ),
- TriggerEventInterface::KEEP_ALIVE_AFTER_TRIGGER ) );
- }
- mFrameRenderedTrigger->Trigger();
+ needFrameRenderedTrigger = true;
}
else
{
// Clear callbacks
callbacks.clear();
}
+
+ if( needFrameRenderedTrigger )
+ {
+ if( !mFrameRenderedTrigger )
+ {
+ mFrameRenderedTrigger = std::unique_ptr< TriggerEventInterface >( TriggerEventFactory::CreateTriggerEvent( MakeCallback( this, &WindowRenderSurface::ProcessFrameCallback ),
+ TriggerEventInterface::KEEP_ALIVE_AFTER_TRIGGER ) );
+ }
+ mFrameRenderedTrigger->Trigger();
+ }
}
MakeContextCurrent();
void WindowRenderSurface::ProcessFrameCallback()
{
+ Dali::Mutex::ScopedLock lock( mMutex );
+
for( auto&& iter : mFrameCallbackInfoContainer )
{
if( !iter->fileDescriptorMonitor )
DALI_LOG_INFO( gWindowRenderSurfaceLogFilter, Debug::Verbose, "WindowRenderSurface::OnFileDescriptorEventDispatched: Frame rendered [%d]\n", fileDescriptor );
- auto frameCallbackInfo = std::find_if( mFrameCallbackInfoContainer.begin(), mFrameCallbackInfoContainer.end(),
- [fileDescriptor]( std::unique_ptr< FrameCallbackInfo >& callbackInfo )
- {
- return callbackInfo->fileDescriptor == fileDescriptor;
- } );
- if( frameCallbackInfo != mFrameCallbackInfoContainer.end() )
+ std::unique_ptr< FrameCallbackInfo > callbackInfo;
+ {
+ Dali::Mutex::ScopedLock lock( mMutex );
+ auto frameCallbackInfo = std::find_if( mFrameCallbackInfoContainer.begin(), mFrameCallbackInfoContainer.end(),
+ [fileDescriptor]( std::unique_ptr< FrameCallbackInfo >& callbackInfo )
+ {
+ return callbackInfo->fileDescriptor == fileDescriptor;
+ } );
+ if( frameCallbackInfo != mFrameCallbackInfoContainer.end() )
+ {
+ callbackInfo = std::move( *frameCallbackInfo );
+
+ mFrameCallbackInfoContainer.erase( frameCallbackInfo );
+ }
+ }
+
+ // Call the connected callback
+ if( callbackInfo )
{
- // Call the connected callback
- for( auto&& iter : ( *frameCallbackInfo )->callbacks )
+ for( auto&& iter : ( callbackInfo )->callbacks )
{
CallbackBase::Execute( *( iter.first ), iter.second );
}
- mFrameCallbackInfoContainer.erase( frameCallbackInfo );
}
}