X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Frender-tasks%2Frender-task-impl.cpp;h=a97069bd09108981692be29f0dbabe0df0a7c86b;hb=462cbee2270984cdca45488f3733d664dcf49187;hp=ce43396afc36625737c19ade7ed3fff02c59b3c4;hpb=c2e24cf1461faf73ded8df8afccc8b4799ccef65;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/render-tasks/render-task-impl.cpp b/dali/internal/event/render-tasks/render-task-impl.cpp index ce43396..a97069b 100644 --- a/dali/internal/event/render-tasks/render-task-impl.cpp +++ b/dali/internal/event/render-tasks/render-task-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,6 +58,7 @@ DALI_PROPERTY_TABLE_BEGIN DALI_PROPERTY( "viewportPosition", VECTOR2, true, true, true, Dali::RenderTask::Property::VIEWPORT_POSITION ) DALI_PROPERTY( "viewportSize", VECTOR2, true, true, true, Dali::RenderTask::Property::VIEWPORT_SIZE ) DALI_PROPERTY( "clearColor", VECTOR4, true, true, true, Dali::RenderTask::Property::CLEAR_COLOR ) +DALI_PROPERTY( "requiresSync", BOOLEAN, true, false, false, Dali::RenderTask::Property::REQUIRES_SYNC ) DALI_PROPERTY_TABLE_END( DEFAULT_OBJECT_PROPERTY_START_INDEX ) // Signals @@ -129,6 +130,14 @@ bool RenderTask::GetInputEnabled() const void RenderTask::SetCameraActor( CameraActor* cameraActor ) { + if( cameraActor ) + { + mCameraConnector.mCamera = cameraActor->GetCamera(); + } + else + { + mCameraConnector.mCamera = NULL; + } mCameraConnector.SetActor( cameraActor ); } @@ -138,45 +147,38 @@ CameraActor* RenderTask::GetCameraActor() const return static_cast< CameraActor* >( mCameraConnector.mActor ); } -void RenderTask::SetTargetFrameBuffer( Dali::FrameBufferImage image ) +void RenderTask::SetTargetFrameBuffer( FrameBufferImagePtr image ) { - if ( mFrameBufferImage != image ) + mFrameBufferImage = image; + FrameBuffer* frameBufferPtr( NULL ); + if( image ) { - // if we have a scene object we need to track connection status and set frame buffer id as well as updating target frame buffer - if ( mSceneObject ) - { - if(mFrameBufferImage) - { - GetImplementation(mFrameBufferImage).Disconnect(); - } - - // update target frame buffer - mFrameBufferImage = image; + frameBufferPtr = image->GetFrameBuffer(); + } - unsigned int resourceId = 0; - bool isNativeFBO = false; - if( mFrameBufferImage ) - { - Dali::Internal::FrameBufferImage& impl = GetImplementation( mFrameBufferImage ); - impl.Connect(); - resourceId = impl.GetResourceId(); - isNativeFBO = impl.IsNativeFbo(); - } + SetFrameBuffer( frameBufferPtr ); +} - // mSceneObject is being used in a separate thread; queue a message to set the value - SetFrameBufferIdMessage( GetEventThreadServices(), *mSceneObject, resourceId, isNativeFBO ); - } - else - { - // update target frame buffer - mFrameBufferImage = image; - } +void RenderTask::SetFrameBuffer( FrameBufferPtr frameBuffer ) +{ + mFrameBuffer = frameBuffer; + Render::FrameBuffer* renderFrameBufferPtr( NULL ); + if( frameBuffer ) + { + renderFrameBufferPtr = mFrameBuffer->GetRenderObject(); } + + SetFrameBufferMessage( GetEventThreadServices(), *mSceneObject, renderFrameBufferPtr ); +} + +FrameBuffer* RenderTask::GetFrameBuffer() const +{ + return mFrameBuffer.Get(); } -Dali::FrameBufferImage RenderTask::GetTargetFrameBuffer() const +FrameBufferImage* RenderTask::GetTargetFrameBuffer() const { - return mFrameBufferImage; + return mFrameBufferImage.Get(); } void RenderTask::SetScreenToFrameBufferFunction( ScreenToFrameBufferFunction conversionFunction ) @@ -201,6 +203,8 @@ Actor* RenderTask::GetScreenToFrameBufferMappingActor() const void RenderTask::SetViewportPosition(const Vector2& value) { + mViewportPosition = value; + BakeViewportPositionMessage( GetEventThreadServices(), *mSceneObject, value ); } @@ -211,6 +215,8 @@ Vector2 RenderTask::GetCurrentViewportPosition() const void RenderTask::SetViewportSize(const Vector2& value) { + mViewportSize = value; + BakeViewportSizeMessage( GetEventThreadServices(), *mSceneObject, value ); } @@ -234,8 +240,8 @@ void RenderTask::GetViewport( Viewport& viewPort ) const if ( mFrameBufferImage ) { viewPort.x = viewPort.y = 0; - viewPort.width = mFrameBufferImage.GetWidth(); - viewPort.height = mFrameBufferImage.GetHeight(); + viewPort.width = mFrameBufferImage->GetWidth(); + viewPort.height = mFrameBufferImage->GetHeight(); } else { @@ -279,6 +285,25 @@ const Vector4& RenderTask::GetClearColor() const return mSceneObject->GetClearColor( GetEventThreadServices().GetEventBufferIndex() ); } +void RenderTask::SetSyncRequired( bool requiresSync ) +{ + if( mRequiresSync != requiresSync ) + { + mRequiresSync = requiresSync; + + if( mSceneObject ) + { + // mSceneObject is being used in a separate thread; queue a message to set the value + SetSyncRequiredMessage( GetEventThreadServices(), *mSceneObject, requiresSync ); + } + } +} + +bool RenderTask::IsSyncRequired() const +{ + return mRequiresSync; +} + void RenderTask::SetClearEnabled( bool enabled ) { if ( mClearEnabled != enabled ) @@ -458,26 +483,14 @@ SceneGraph::RenderTask* RenderTask::CreateSceneObject() // Keep the raw-pointer until DiscardSceneObject is called mSceneObject = SceneGraph::RenderTask::New(); - // if we have a frame buffer we need to track connection status then send a message to set the frame buffer id in case it has changed since last time we were on stage - unsigned int resourceId = 0; - bool isNativeFBO = false; - if( mFrameBufferImage ) - { - Dali::Internal::FrameBufferImage& impl = GetImplementation( mFrameBufferImage ); - impl.Connect(); - resourceId = impl.GetResourceId(); - isNativeFBO = impl.IsNativeFbo(); - } - - // mSceneObject is being used in a separate thread; queue a message to set the value - SetFrameBufferIdMessage( GetEventThreadServices(), *mSceneObject, resourceId, isNativeFBO ); - // Send messages to set other properties that may have changed since last time we were on stage SetExclusiveMessage( GetEventThreadServices(), *mSceneObject, mExclusive ); SetClearColorMessage( GetEventThreadServices(), *mSceneObject, mClearColor ); SetClearEnabledMessage( GetEventThreadServices(), *mSceneObject, mClearEnabled ); SetCullModeMessage( GetEventThreadServices(), *mSceneObject, mCullMode ); SetRefreshRateMessage( GetEventThreadServices(), *mSceneObject, mRefreshRate ); + SetSyncRequiredMessage( GetEventThreadServices(), *mSceneObject, mRequiresSync ); + SetFrameBuffer( mFrameBuffer ); // Caller takes ownership return mSceneObject; @@ -492,12 +505,6 @@ void RenderTask::DiscardSceneObject() { // mSceneObject is not owned; throw away the raw-pointer mSceneObject = NULL; - - // if we have a frame buffer we need to track connection status - if(mFrameBufferImage) - { - GetImplementation(mFrameBufferImage).Disconnect(); - } } /******************************************************************************** @@ -593,6 +600,11 @@ void RenderTask::SetDefaultProperty( Property::Index index, const Property::Valu SetClearColor( property.Get() ); break; } + case Dali::RenderTask::Property::REQUIRES_SYNC: + { + SetSyncRequired( property.Get() ); + break; + } default: { // nothing to do @@ -610,6 +622,44 @@ Property::Value RenderTask::GetDefaultProperty(Property::Index index) const case Dali::RenderTask::Property::VIEWPORT_POSITION: { + value = mViewportPosition; + break; + } + case Dali::RenderTask::Property::VIEWPORT_SIZE: + { + value = mViewportSize; + break; + } + case Dali::RenderTask::Property::CLEAR_COLOR: + { + value = mClearColor; + break; + } + case Dali::RenderTask::Property::REQUIRES_SYNC: + { + value = IsSyncRequired(); + break; + } + + default: + { + DALI_ASSERT_ALWAYS(false && "RenderTask property index out of range"); // should not come here + break; + } + } + + return value; +} + +Property::Value RenderTask::GetDefaultPropertyCurrentValue( Property::Index index ) const +{ + Property::Value value; + + switch ( index ) + { + + case Dali::RenderTask::Property::VIEWPORT_POSITION: + { value = GetCurrentViewportPosition(); break; } @@ -623,6 +673,11 @@ Property::Value RenderTask::GetDefaultProperty(Property::Index index) const value = GetClearColor(); break; } + case Dali::RenderTask::Property::REQUIRES_SYNC: + { + value = IsSyncRequired(); + break; + } default: { @@ -634,6 +689,34 @@ Property::Value RenderTask::GetDefaultProperty(Property::Index index) const return value; } +void RenderTask::OnNotifyDefaultPropertyAnimation( Animation& animation, Property::Index index, const Property::Value& value ) +{ + switch ( index ) + { + case Dali::RenderTask::Property::VIEWPORT_POSITION: + { + value.Get( mViewportPosition ); + break; + } + case Dali::RenderTask::Property::VIEWPORT_SIZE: + { + value.Get( mViewportSize ); + break; + } + case Dali::RenderTask::Property::CLEAR_COLOR: + { + value.Get( mClearColor ); + break; + } + case Dali::RenderTask::Property::REQUIRES_SYNC: + default: + { + // Nothing to do as not animatable + break; + } + } +} + const SceneGraph::PropertyOwner* RenderTask::GetSceneObject() const { return mSceneObject; @@ -686,7 +769,7 @@ const PropertyInputImpl* RenderTask::GetSceneObjectInputProperty( Property::Inde break; case Dali::RenderTask::Property::CLEAR_COLOR: - property = &mSceneObject->mViewportSize; + property = &mSceneObject->mClearColor; break; default: @@ -732,7 +815,7 @@ Dali::RenderTask::RenderTaskSignalType& RenderTask::FinishedSignal() bool RenderTask::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) { bool connected( true ); - RenderTask* renderTask = dynamic_cast(object); + RenderTask* renderTask = static_cast< RenderTask* >(object); // TypeRegistry guarantees that this is the correct type. if ( 0 == strcmp( signalName.c_str(), SIGNAL_FINISHED ) ) { @@ -753,6 +836,8 @@ RenderTask::RenderTask( bool isSystemLevel ) mCameraConnector( Connector::CAMERA_CONNECTOR, *this ), mMappingConnector( Connector::MAPPING_CONNECTOR, *this ), mClearColor( Dali::RenderTask::DEFAULT_CLEAR_COLOR ), + mViewportPosition( Vector2::ZERO ), + mViewportSize( Vector2::ZERO ), mRefreshRate( Dali::RenderTask::DEFAULT_REFRESH_RATE ), mRefreshOnceCounter( 0u ), mScreenToFrameBufferFunction( Dali::RenderTask::DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION ), @@ -760,7 +845,8 @@ RenderTask::RenderTask( bool isSystemLevel ) mInputEnabled( Dali::RenderTask::DEFAULT_INPUT_ENABLED ), mClearEnabled( Dali::RenderTask::DEFAULT_CLEAR_ENABLED ), mCullMode( Dali::RenderTask::DEFAULT_CULL_MODE ), - mIsSystemLevel( isSystemLevel ) + mIsSystemLevel( isSystemLevel ), + mRequiresSync( false ) { DALI_LOG_INFO(gLogRender, Debug::General, "RenderTask::RenderTask(this:%p)\n", this); } @@ -775,7 +861,8 @@ RenderTask::~RenderTask() RenderTask::Connector::Connector( Type type, RenderTask& renderTask ) : mType( type ), mRenderTask( renderTask ), - mActor( NULL ) + mActor( NULL ), + mCamera( NULL ) { } @@ -826,6 +913,7 @@ void RenderTask::Connector::ObjectDestroyed( Object& object ) } mActor = NULL; + mCamera = NULL; // only meaningful for the camera connector but no simple way to distinguish UpdateRenderTask(); } @@ -856,7 +944,7 @@ void RenderTask::Connector::UpdateRenderTask() } else if( CAMERA_CONNECTOR == mType ) { - SetCameraNodeMessage( mRenderTask.GetEventThreadServices(), *(mRenderTask.mSceneObject), node ); + SetCameraMessage( mRenderTask.GetEventThreadServices(), *(mRenderTask.mSceneObject), node, mCamera ); } } }