X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Frendering%2Fscene-graph-renderer.cpp;h=2fd1cfb632c5f4cc0a52e2b1314a179a23d0a3a5;hb=ad06250b0131a81ad28ae63c7e063f3d291d3060;hp=6514401bc52258ebc784207665496d553ef832ed;hpb=ba5ad9b4f9cc695a5b4ddbe0aa349bc8f596306e;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/update/rendering/scene-graph-renderer.cpp b/dali/internal/update/rendering/scene-graph-renderer.cpp index 6514401..2fd1cfb 100644 --- a/dali/internal/update/rendering/scene-graph-renderer.cpp +++ b/dali/internal/update/rendering/scene-graph-renderer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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. @@ -17,14 +17,12 @@ // CLASS HEADER #include "scene-graph-renderer.h" -// INTERNAL HEADERS +// INTERNAL INCLUDES #include #include #include -#include #include #include -#include #include #include #include @@ -87,18 +85,32 @@ void AddMappings( Dali::Internal::SceneGraph::CollectedUniformMap& localMap, con } } -// flags for resending data to renderer +// Flags for re-sending data to renderer. enum Flags { - RESEND_DATA_PROVIDER = 1, - RESEND_GEOMETRY = 1 << 1, - RESEND_FACE_CULLING_MODE = 1 << 2, - RESEND_BLEND_COLOR = 1 << 3, - RESEND_BLEND_BIT_MASK = 1 << 4, - RESEND_PREMULTIPLIED_ALPHA = 1 << 5 + RESEND_DATA_PROVIDER = 1 << 0, + RESEND_GEOMETRY = 1 << 1, + RESEND_FACE_CULLING_MODE = 1 << 2, + RESEND_BLEND_COLOR = 1 << 3, + RESEND_BLEND_BIT_MASK = 1 << 4, + RESEND_PREMULTIPLIED_ALPHA = 1 << 5, + RESEND_INDEXED_DRAW_FIRST_ELEMENT = 1 << 6, + RESEND_INDEXED_DRAW_ELEMENTS_COUNT = 1 << 7, + RESEND_DEPTH_WRITE_MODE = 1 << 8, + RESEND_DEPTH_TEST_MODE = 1 << 9, + RESEND_DEPTH_FUNCTION = 1 << 10, + RESEND_STENCIL_MODE = 1 << 11, + RESEND_STENCIL_FUNCTION = 1 << 12, + RESEND_STENCIL_FUNCTION_MASK = 1 << 13, + RESEND_STENCIL_FUNCTION_REFERENCE = 1 << 14, + RESEND_STENCIL_MASK = 1 << 15, + RESEND_STENCIL_OPERATION_ON_FAIL = 1 << 16, + RESEND_STENCIL_OPERATION_ON_Z_FAIL = 1 << 17, + RESEND_STENCIL_OPERATION_ON_Z_PASS = 1 << 18, + RESEND_WRITE_TO_COLOR_BUFFER = 1 << 19 }; -} +} // Anonymous namespace namespace Dali { @@ -113,24 +125,31 @@ Renderer* Renderer::New() } Renderer::Renderer() -:mSceneController(0), - mRenderer(NULL), - mTextureSet(NULL), - mGeometry(NULL), - mShader(NULL), - mBlendColor(NULL), - mBlendBitmask(0u), - mFaceCullingMode( Dali::Renderer::NONE ), - mBlendingMode( Dali::BlendingMode::AUTO ), - mReferenceCount(0), - mRegenerateUniformMap(0), - mResendFlag(0), - mResourcesReady(false), - mFinishedResourceAcquisition(false), - mDepthIndex(0) -{ - mUniformMapChanged[0]=false; - mUniformMapChanged[1]=false; +: mSceneController( 0 ), + mRenderer( NULL ), + mTextureSet( NULL ), + mGeometry( NULL ), + mShader( NULL ), + mBlendColor( NULL ), + mStencilParameters( StencilMode::AUTO, StencilFunction::ALWAYS, 0xFF, 0x00, 0xFF, StencilOperation::KEEP, StencilOperation::KEEP, StencilOperation::KEEP ), + mIndexedDrawFirstElement( 0u ), + mIndexedDrawElementsCount( 0u ), + mBlendBitmask( 0u ), + mRegenerateUniformMap( 0u ), + mResendFlag( 0u ), + mDepthFunction( DepthFunction::LESS ), + mFaceCullingMode( FaceCullingMode::NONE ), + mBlendMode( BlendMode::AUTO ), + mDepthWriteMode( DepthWriteMode::AUTO ), + mDepthTestMode( DepthTestMode::AUTO ), + mWriteToColorBuffer( true ), + mResourcesReady( false ), + mFinishedResourceAcquisition( false ), + mPremultipledAlphaEnabled( false ), + mDepthIndex( 0 ) +{ + mUniformMapChanged[0] = false; + mUniformMapChanged[1] = false; // Observe our own PropertyOwner's uniform map AddUniformMapObserver( *this ); @@ -140,20 +159,14 @@ Renderer::~Renderer() { if (mTextureSet) { - mTextureSet->RemoveConnectionObserver(*this); + mTextureSet->RemoveObserver(this); mTextureSet=NULL; } - if (mGeometry) - { - mGeometry->RemoveConnectionObserver(*this); - mGeometry=NULL; - } if( mShader ) { mShader->RemoveConnectionObserver(*this); mShader=NULL; } - } void Renderer::operator delete( void* ptr ) @@ -168,7 +181,7 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex ) mFinishedResourceAcquisition = false; // Can only be considered ready when all the scene graph objects are connected to the renderer - if( ( mGeometry ) && ( mGeometry->GetVertexBuffers().Count() > 0 ) && ( mShader ) ) + if( mGeometry && mShader ) { if( mTextureSet ) { @@ -194,14 +207,10 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex ) const UniformMap& rendererUniformMap = PropertyOwner::GetUniformMap(); AddMappings( localMap, rendererUniformMap ); - if( mTextureSet ) + if( mShader ) { - AddMappings( localMap, mTextureSet->GetUniformMap() ); + AddMappings( localMap, mShader->GetUniformMap() ); } - - AddMappings( localMap, mShader->GetUniformMap() ); - AddMappings( localMap, mGeometry->GetUniformMap() ); - } else if( mRegenerateUniformMap == COPY_UNIFORM_MAP ) { @@ -222,63 +231,152 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex ) mRegenerateUniformMap--; } - if( mResendFlag == 0 ) + if( mResendFlag != 0 ) { - return; - } + if( mResendFlag & RESEND_DATA_PROVIDER ) + { + RenderDataProvider* dataProvider = NewRenderDataProvider(); - if( mResendFlag & RESEND_DATA_PROVIDER ) - { - RenderDataProvider* dataProvider = NewRenderDataProvider(); + typedef MessageValue1< Render::Renderer, OwnerPointer > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetRenderDataProvider, dataProvider ); + } - typedef MessageValue1< Render::Renderer, OwnerPointer > DerivedType; - unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); - new (slot) DerivedType( mRenderer, &Render::Renderer::SetRenderDataProvider, dataProvider ); - mResendFlag &= ~RESEND_DATA_PROVIDER; - } + if( mResendFlag & RESEND_GEOMETRY ) + { + typedef MessageValue1< Render::Renderer, Render::Geometry* > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); - if( mResendFlag & RESEND_GEOMETRY ) - { - // The first call to GetRenderGeometry() creates the geometry and sends it in a message - RenderGeometry* geometry = mGeometry->GetRenderGeometry( mSceneController ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetGeometry, mGeometry ); + } - typedef MessageValue1< Render::Renderer, RenderGeometry* > DerivedType; - unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + if( mResendFlag & RESEND_FACE_CULLING_MODE ) + { + typedef MessageValue1< Render::Renderer, FaceCullingMode::Type > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetFaceCullingMode, mFaceCullingMode ); + } - new (slot) DerivedType( mRenderer, &Render::Renderer::SetGeometry, geometry ); - mResendFlag &= ~RESEND_GEOMETRY; - } + if( mResendFlag & RESEND_BLEND_BIT_MASK ) + { + typedef MessageValue1< Render::Renderer, unsigned int > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetBlendingBitMask, mBlendBitmask ); + } - if( mResendFlag & RESEND_FACE_CULLING_MODE ) - { - typedef MessageValue1< Render::Renderer, Dali::Renderer::FaceCullingMode > DerivedType; - unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); - new (slot) DerivedType( mRenderer, &Render::Renderer::SetFaceCullingMode, mFaceCullingMode ); - mResendFlag &= ~RESEND_FACE_CULLING_MODE; - } + if( mResendFlag & RESEND_BLEND_COLOR ) + { + typedef MessageValue1< Render::Renderer, const Vector4* > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetBlendColor, mBlendColor ); + } - if( mResendFlag & RESEND_BLEND_BIT_MASK ) - { - typedef MessageValue1< Render::Renderer, unsigned int > DerivedType; - unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); - new (slot) DerivedType( mRenderer, &Render::Renderer::SetBlendingBitMask, mBlendBitmask ); - mResendFlag &= ~RESEND_BLEND_BIT_MASK; - } + if( mResendFlag & RESEND_PREMULTIPLIED_ALPHA ) + { + typedef MessageValue1< Render::Renderer, bool > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::EnablePreMultipliedAlpha, mPremultipledAlphaEnabled ); + } - if( mResendFlag & RESEND_BLEND_COLOR ) - { - typedef MessageValue1< Render::Renderer, const Vector4* > DerivedType; - unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); - new (slot) DerivedType( mRenderer, &Render::Renderer::SetBlendColor, mBlendColor ); - mResendFlag &= ~RESEND_BLEND_COLOR; - } + if( mResendFlag & RESEND_INDEXED_DRAW_FIRST_ELEMENT ) + { + typedef MessageValue1< Render::Renderer, size_t > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetIndexedDrawFirstElement, mIndexedDrawFirstElement ); + } - if( mResendFlag & RESEND_PREMULTIPLIED_ALPHA ) - { - typedef MessageValue1< Render::Renderer, bool > DerivedType; - unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); - new (slot) DerivedType( mRenderer, &Render::Renderer::EnablePreMultipliedAlpha, mPremultipledAlphaEnabled ); - mResendFlag &= ~RESEND_PREMULTIPLIED_ALPHA; + if( mResendFlag & RESEND_INDEXED_DRAW_ELEMENTS_COUNT ) + { + typedef MessageValue1< Render::Renderer, size_t > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetIndexedDrawElementsCount, mIndexedDrawElementsCount ); + } + + if( mResendFlag & RESEND_DEPTH_WRITE_MODE ) + { + typedef MessageValue1< Render::Renderer, DepthWriteMode::Type > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetDepthWriteMode, mDepthWriteMode ); + } + + if( mResendFlag & RESEND_DEPTH_TEST_MODE ) + { + typedef MessageValue1< Render::Renderer, DepthTestMode::Type > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetDepthTestMode, mDepthTestMode ); + } + + if( mResendFlag & RESEND_DEPTH_FUNCTION ) + { + typedef MessageValue1< Render::Renderer, DepthFunction::Type > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetDepthFunction, mDepthFunction ); + } + + if( mResendFlag & RESEND_STENCIL_MODE ) + { + typedef MessageValue1< Render::Renderer, StencilMode::Type > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetStencilMode, mStencilParameters.stencilMode ); + } + + if( mResendFlag & RESEND_STENCIL_FUNCTION ) + { + typedef MessageValue1< Render::Renderer, StencilFunction::Type > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetStencilFunction, mStencilParameters.stencilFunction ); + } + + if( mResendFlag & RESEND_STENCIL_FUNCTION_MASK ) + { + typedef MessageValue1< Render::Renderer, int > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetStencilFunctionMask, mStencilParameters.stencilFunctionMask ); + } + + if( mResendFlag & RESEND_STENCIL_FUNCTION_REFERENCE ) + { + typedef MessageValue1< Render::Renderer, int > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetStencilFunctionReference, mStencilParameters.stencilFunctionReference ); + } + + if( mResendFlag & RESEND_STENCIL_MASK ) + { + typedef MessageValue1< Render::Renderer, int > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetStencilMask, mStencilParameters.stencilMask ); + } + + if( mResendFlag & RESEND_STENCIL_OPERATION_ON_FAIL ) + { + typedef MessageValue1< Render::Renderer, StencilOperation::Type > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetStencilOperationOnFail, mStencilParameters.stencilOperationOnFail ); + } + + if( mResendFlag & RESEND_STENCIL_OPERATION_ON_Z_FAIL ) + { + typedef MessageValue1< Render::Renderer, StencilOperation::Type > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetStencilOperationOnZFail, mStencilParameters.stencilOperationOnZFail ); + } + + if( mResendFlag & RESEND_STENCIL_OPERATION_ON_Z_PASS ) + { + typedef MessageValue1< Render::Renderer, StencilOperation::Type > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetStencilOperationOnZPass, mStencilParameters.stencilOperationOnZPass ); + } + + if( mResendFlag & RESEND_WRITE_TO_COLOR_BUFFER ) + { + typedef MessageValue1< Render::Renderer, bool > DerivedType; + unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) ); + new (slot) DerivedType( mRenderer, &Render::Renderer::SetWriteToColorBuffer, mWriteToColorBuffer ); + } + + mResendFlag = 0; } } @@ -288,11 +386,11 @@ void Renderer::SetTextures( TextureSet* textureSet ) if( mTextureSet ) { - mTextureSet->RemoveConnectionObserver(*this); + mTextureSet->RemoveObserver(this); } mTextureSet = textureSet; - mTextureSet->AddConnectionObserver( *this ); + mTextureSet->AddObserver( this ); mRegenerateUniformMap = REGENERATE_UNIFORM_MAP; mResendFlag |= RESEND_DATA_PROVIDER; } @@ -312,18 +410,10 @@ void Renderer::SetShader( Shader* shader ) mResendFlag |= RESEND_DATA_PROVIDER; } -void Renderer::SetGeometry( Geometry* geometry ) +void Renderer::SetGeometry( Render::Geometry* geometry ) { DALI_ASSERT_DEBUG( geometry != NULL && "Geometry pointer is NULL"); - if( mGeometry) - { - mGeometry->RemoveConnectionObserver(*this); - mGeometry->OnRendererDisconnect(); - } - mGeometry = geometry; - mGeometry->AddConnectionObserver( *this ); // Observe geometry connections / uniform mapping changes - mRegenerateUniformMap = REGENERATE_UNIFORM_MAP; if( mRenderer ) { @@ -336,15 +426,15 @@ void Renderer::SetDepthIndex( int depthIndex ) mDepthIndex = depthIndex; } -void Renderer::SetFaceCullingMode( unsigned int faceCullingMode ) +void Renderer::SetFaceCullingMode( FaceCullingMode::Type faceCullingMode ) { - mFaceCullingMode = static_cast(faceCullingMode); + mFaceCullingMode = faceCullingMode; mResendFlag |= RESEND_FACE_CULLING_MODE; } -void Renderer::SetBlendingMode( unsigned int blendingMode ) +void Renderer::SetBlendMode( BlendMode::Type blendingMode ) { - mBlendingMode = static_cast< BlendingMode::Type >( blendingMode ); + mBlendMode = blendingMode; } void Renderer::SetBlendingOptions( unsigned int options ) @@ -370,43 +460,94 @@ void Renderer::SetBlendColor( const Vector4& blendColor ) mResendFlag |= RESEND_BLEND_COLOR; } +void Renderer::SetIndexedDrawFirstElement( size_t firstElement ) +{ + mIndexedDrawFirstElement = firstElement; + mResendFlag |= RESEND_INDEXED_DRAW_FIRST_ELEMENT; +} + +void Renderer::SetIndexedDrawElementsCount( size_t elementsCount ) +{ + mIndexedDrawElementsCount = elementsCount; + mResendFlag |= RESEND_INDEXED_DRAW_ELEMENTS_COUNT; +} + void Renderer::EnablePreMultipliedAlpha( bool preMultipled ) { mPremultipledAlphaEnabled = preMultipled; mResendFlag |= RESEND_PREMULTIPLIED_ALPHA; } -//Called when a node with this renderer is added to the stage -void Renderer::OnStageConnect() +void Renderer::SetDepthWriteMode( DepthWriteMode::Type depthWriteMode ) { - ++mReferenceCount; - if( !mRenderer) - { - RenderDataProvider* dataProvider = NewRenderDataProvider(); - - RenderGeometry* renderGeometry = mGeometry->GetRenderGeometry(mSceneController); - mRenderer = Render::Renderer::New( dataProvider, renderGeometry, - mBlendBitmask, mBlendColor, - static_cast< Dali::Renderer::FaceCullingMode >( mFaceCullingMode ), - mPremultipledAlphaEnabled ); - mSceneController->GetRenderMessageDispatcher().AddRenderer( *mRenderer ); - mResendFlag = 0; - } + mDepthWriteMode = depthWriteMode; + mResendFlag |= RESEND_DEPTH_WRITE_MODE; } -//Called when the node with this renderer has gone out of the stage -void Renderer::OnStageDisconnect() +void Renderer::SetDepthTestMode( DepthTestMode::Type depthTestMode ) { - --mReferenceCount; - if( mReferenceCount == 0 ) - { - mSceneController->GetRenderMessageDispatcher().RemoveRenderer( *mRenderer ); - if( mGeometry ) - { - mGeometry->OnRendererDisconnect(); - } - mRenderer = NULL; - } + mDepthTestMode = depthTestMode; + mResendFlag |= RESEND_DEPTH_TEST_MODE; +} + +void Renderer::SetDepthFunction( DepthFunction::Type depthFunction ) +{ + mDepthFunction = depthFunction; + mResendFlag |= RESEND_DEPTH_FUNCTION; +} + +void Renderer::SetStencilMode( StencilMode::Type mode ) +{ + mStencilParameters.stencilMode = mode; + mResendFlag |= RESEND_STENCIL_MODE; +} + +void Renderer::SetStencilFunction( StencilFunction::Type stencilFunction ) +{ + mStencilParameters.stencilFunction = stencilFunction; + mResendFlag |= RESEND_STENCIL_FUNCTION; +} + +void Renderer::SetStencilFunctionMask( int stencilFunctionMask ) +{ + mStencilParameters.stencilFunctionMask = stencilFunctionMask; + mResendFlag |= RESEND_STENCIL_FUNCTION_MASK; +} + +void Renderer::SetStencilFunctionReference( int stencilFunctionReference ) +{ + mStencilParameters.stencilFunctionReference = stencilFunctionReference; + mResendFlag |= RESEND_STENCIL_FUNCTION_REFERENCE; +} + +void Renderer::SetStencilMask( int stencilMask ) +{ + mStencilParameters.stencilMask = stencilMask; + mResendFlag |= RESEND_STENCIL_MASK; +} + +void Renderer::SetStencilOperationOnFail( StencilOperation::Type stencilOperationOnFail ) +{ + mStencilParameters.stencilOperationOnFail = stencilOperationOnFail; + mResendFlag |= RESEND_STENCIL_OPERATION_ON_FAIL; +} + +void Renderer::SetStencilOperationOnZFail( StencilOperation::Type stencilOperationOnZFail ) +{ + mStencilParameters.stencilOperationOnZFail = stencilOperationOnZFail; + mResendFlag |= RESEND_STENCIL_OPERATION_ON_Z_FAIL; +} + +void Renderer::SetStencilOperationOnZPass( StencilOperation::Type stencilOperationOnZPass ) +{ + mStencilParameters.stencilOperationOnZPass = stencilOperationOnZPass; + mResendFlag |= RESEND_STENCIL_OPERATION_ON_Z_PASS; +} + +void Renderer::SetWriteToColorBuffer( bool writeToColorBuffer ) +{ + mWriteToColorBuffer = writeToColorBuffer; + mResendFlag |= RESEND_WRITE_TO_COLOR_BUFFER; } //Called when SceneGraph::Renderer is added to update manager ( that happens when an "event-thread renderer" is created ) @@ -414,8 +555,13 @@ void Renderer::ConnectToSceneGraph( SceneController& sceneController, BufferInde { mRegenerateUniformMap = REGENERATE_UNIFORM_MAP; mSceneController = &sceneController; -} + RenderDataProvider* dataProvider = NewRenderDataProvider(); + mRenderer = Render::Renderer::New( dataProvider, mGeometry, mBlendBitmask, mBlendColor, static_cast< FaceCullingMode::Type >( mFaceCullingMode ), + mPremultipledAlphaEnabled, mDepthWriteMode, mDepthTestMode, mDepthFunction, mStencilParameters, mWriteToColorBuffer ); + + mSceneController->GetRenderMessageDispatcher().AddRenderer( *mRenderer ); +} //Called just before destroying the scene-graph renderer ( when the "event-thread renderer" is no longer referenced ) void Renderer::DisconnectFromSceneGraph( SceneController& sceneController, BufferIndex bufferIndex ) @@ -425,8 +571,8 @@ void Renderer::DisconnectFromSceneGraph( SceneController& sceneController, Buffe { mSceneController->GetRenderMessageDispatcher().RemoveRenderer( *mRenderer ); mRenderer = NULL; - mSceneController = NULL; } + mSceneController = NULL; } RenderDataProvider* Renderer::NewRenderDataProvider() @@ -440,10 +586,20 @@ RenderDataProvider* Renderer::NewRenderDataProvider() { size_t textureCount( mTextureSet->GetTextureCount() ); dataProvider->mTextures.resize( textureCount ); + dataProvider->mSamplers.resize( textureCount ); + for( unsigned int i(0); imTextures[i] = Render::Texture( mTextureSet->GetTextureId(i),0); + dataProvider->mSamplers[i] = mTextureSet->GetTextureSampler(i); + } + + textureCount = mTextureSet->GetNewTextureCount(); + dataProvider->mNewTextures.resize( textureCount ); + dataProvider->mSamplers.resize( textureCount ); for( unsigned int i(0); imTextures[i] = Render::Texture( mTextureSet->GetTextureId(i), - mTextureSet->GetTextureSampler(i)); + dataProvider->mNewTextures[i] = mTextureSet->GetNewTexture(i); + dataProvider->mSamplers[i] = mTextureSet->GetTextureSampler(i); } } @@ -458,7 +614,7 @@ Render::Renderer& Renderer::GetRenderer() const CollectedUniformMap& Renderer::GetUniformMap( BufferIndex bufferIndex ) const { return mCollectedUniformMap[bufferIndex]; -}; +} void Renderer::GetReadyAndComplete( bool& ready, bool& complete ) const { @@ -470,16 +626,16 @@ Renderer::Opacity Renderer::GetOpacity( BufferIndex updateBufferIndex, const Nod { Renderer::Opacity opacity = Renderer::OPAQUE; - switch( mBlendingMode ) + switch( mBlendMode ) { - case BlendingMode::ON: // If the renderer should always be use blending + case BlendMode::ON: // If the renderer should always be use blending { opacity = Renderer::TRANSLUCENT; break; } - case BlendingMode::AUTO: + case BlendMode::AUTO: { - bool shaderRequiresBlending( mShader->GeometryHintEnabled( Dali::ShaderEffect::HINT_BLENDING ) ); + bool shaderRequiresBlending( mShader->HintEnabled( Dali::Shader::HINT_OUTPUT_IS_TRANSPARENT ) ); if( shaderRequiresBlending || ( mTextureSet && mTextureSet->HasAlpha() ) ) { opacity = Renderer::TRANSLUCENT; @@ -498,7 +654,7 @@ Renderer::Opacity Renderer::GetOpacity( BufferIndex updateBufferIndex, const Nod } break; } - case BlendingMode::OFF: // the renderer should never use blending + case BlendMode::OFF: // the renderer should never use blending default: { opacity = Renderer::OPAQUE; @@ -510,6 +666,11 @@ Renderer::Opacity Renderer::GetOpacity( BufferIndex updateBufferIndex, const Nod return opacity; } +void Renderer::TextureSetChanged() +{ + mResendFlag |= RESEND_DATA_PROVIDER; +} + void Renderer::ConnectionsChanged( PropertyOwner& object ) { // One of our child objects has changed it's connections. Ensure the uniform @@ -533,11 +694,7 @@ void Renderer::UniformMappingsChanged( const UniformMap& mappings ) void Renderer::ObservedObjectDestroyed(PropertyOwner& owner) { - if( reinterpret_cast(mGeometry) == &owner ) - { - mGeometry = NULL; - } - else if( reinterpret_cast(mTextureSet) == &owner ) + if( reinterpret_cast(mTextureSet) == &owner ) { mTextureSet = NULL; }