Mark uniform map as not having changed when it's ready
[platform/core/uifw/dali-core.git] / dali / internal / update / rendering / scene-graph-renderer.cpp
index 2854a70..f2ecb41 100644 (file)
@@ -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.
 // CLASS HEADER
 #include "scene-graph-renderer.h"
 
-// INTERNAL HEADERS
-#include <dali/internal/update/controllers/scene-controller.h>
-#include <dali/internal/render/renderers/render-geometry.h>
+// INTERNAL INCLUDES
+#include <dali/internal/common/internal-constants.h>
+#include <dali/internal/common/memory-pool-object-allocator.h>
 #include <dali/internal/update/controllers/render-message-dispatcher.h>
-#include <dali/internal/update/rendering/scene-graph-geometry.h>
-#include <dali/internal/update/rendering/scene-graph-material.h>
-#include <dali/internal/render/shaders/scene-graph-shader.h>
-#include <dali/internal/render/renderers/render-renderer.h>
-#include <dali/internal/render/data-providers/node-data-provider.h>
+#include <dali/internal/update/controllers/scene-controller.h>
 #include <dali/internal/update/nodes/node.h>
+#include <dali/internal/update/rendering/scene-graph-texture-set.h>
+#include <dali/internal/render/data-providers/node-data-provider.h>
 #include <dali/internal/render/queue/render-queue.h>
-#include <dali/internal/common/internal-constants.h>
-
+#include <dali/internal/render/renderers/render-geometry.h>
+#include <dali/internal/render/shaders/program.h>
+#include <dali/internal/render/shaders/scene-graph-shader.h>
 
 namespace // unnamed namespace
 {
@@ -38,6 +37,9 @@ const unsigned int UNIFORM_MAP_READY      = 0;
 const unsigned int COPY_UNIFORM_MAP       = 1;
 const unsigned int REGENERATE_UNIFORM_MAP = 2;
 
+//Memory pool used to allocate new renderers. Memory used by this pool will be released when shutting down DALi
+Dali::Internal::MemoryPoolObjectAllocator<Dali::Internal::SceneGraph::Renderer> gRendererMemoryPool;
+
 void AddMappings( Dali::Internal::SceneGraph::CollectedUniformMap& localMap, const Dali::Internal::SceneGraph::UniformMap& uniformMap )
 {
   // Iterate thru uniformMap.
@@ -80,10 +82,35 @@ void AddMappings( Dali::Internal::SceneGraph::CollectedUniformMap& localMap, con
       const Dali::Internal::SceneGraph::UniformPropertyMapping* map = (*iter);
       localMap.PushBack( map );
     }
-    //@todo MESH_REWORK Use memcpy to copy ptrs from one array to the other
   }
 }
-}
+
+// Flags for re-sending data to renderer.
+enum Flags
+{
+  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_RENDER_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
 {
@@ -92,21 +119,34 @@ namespace Internal
 namespace SceneGraph
 {
 
+Renderer* Renderer::New()
+{
+  return new ( gRendererMemoryPool.AllocateRawThreadSafe() ) Renderer();
+}
+
 Renderer::Renderer()
-:mSceneController(0),
- mRenderer(NULL),
- mMaterial(NULL),
- mGeometry(NULL),
- mReferenceCount(0),
- mRegenerateUniformMap(0),
- mResendDataProviders(false),
- mResendGeometry(false),
- 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( RenderMode::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 ),
+  mPremultipledAlphaEnabled( false ),
+  mDepthIndex( 0 )
+{
+  mUniformMapChanged[0] = false;
+  mUniformMapChanged[1] = false;
 
   // Observe our own PropertyOwner's uniform map
   AddUniformMapObserver( *this );
@@ -114,35 +154,32 @@ Renderer::Renderer()
 
 Renderer::~Renderer()
 {
-  if (mMaterial)
+  if( mTextureSet )
   {
-    mMaterial->RemoveConnectionObserver(*this);
-    mMaterial=NULL;
+    mTextureSet->RemoveObserver( this );
+    mTextureSet = NULL;
   }
-  if (mGeometry)
+  if( mShader )
   {
-    mGeometry->RemoveConnectionObserver(*this);
-    mGeometry=NULL;
+    mShader->RemoveConnectionObserver( *this );
+    mShader = NULL;
   }
 }
 
-void Renderer::PrepareRender( BufferIndex updateBufferIndex )
+void Renderer::operator delete( void* ptr )
 {
-  mResourcesReady = false;
-  mFinishedResourceAcquisition = false;
+  gRendererMemoryPool.FreeThreadSafe( static_cast<Renderer*>( ptr ) );
+}
+
 
-  // Can only be considered ready when all the scene graph objects are connected to the renderer
-  if( ( mGeometry ) && ( mGeometry->GetVertexBuffers().Count() > 0 ) &&
-      ( mMaterial ) && ( mMaterial->GetShader() != NULL ) )
+void Renderer::PrepareRender( BufferIndex updateBufferIndex )
+{
+  if( mRegenerateUniformMap == UNIFORM_MAP_READY )
   {
-    mMaterial->GetResourcesStatus( mResourcesReady, mFinishedResourceAcquisition );
+    mUniformMapChanged[updateBufferIndex] = false;
   }
-
-  if( mRegenerateUniformMap > UNIFORM_MAP_READY )
+  else
   {
-    DALI_ASSERT_DEBUG( mGeometry != NULL && "No geometry available in DoPrepareRender()" );
-    DALI_ASSERT_DEBUG( mMaterial != NULL && "No geometry available in DoPrepareRender()" );
-
     if( mRegenerateUniformMap == REGENERATE_UNIFORM_MAP)
     {
       CollectedUniformMap& localMap = mCollectedUniformMap[ updateBufferIndex ];
@@ -151,10 +188,10 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex )
       const UniformMap& rendererUniformMap = PropertyOwner::GetUniformMap();
       AddMappings( localMap, rendererUniformMap );
 
-      AddMappings( localMap, mMaterial->GetUniformMap() );
-      AddMappings( localMap, mMaterial->GetShader()->GetUniformMap() );
-      AddMappings( localMap, mGeometry->GetUniformMap() );
-
+      if( mShader )
+      {
+        AddMappings( localMap, mShader->GetUniformMap() );
+      }
     }
     else if( mRegenerateUniformMap == COPY_UNIFORM_MAP )
     {
@@ -175,56 +212,185 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex )
     mRegenerateUniformMap--;
   }
 
-  if( mResendDataProviders )
+  if( mResendFlag != 0 )
   {
-    RenderDataProvider* dataProvider = NewRenderDataProvider();
+    if( mResendFlag & RESEND_DATA_PROVIDER )
+    {
+      OwnerPointer<RenderDataProvider> dataProvider = NewRenderDataProvider();
 
-    typedef MessageValue1< Render::Renderer, OwnerPointer<RenderDataProvider> > DerivedType;
-    unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) );
-    new (slot) DerivedType( mRenderer, &Render::Renderer::SetRenderDataProvider, dataProvider );
-    mResendDataProviders = false;
-  }
+      typedef MessageValue1< Render::Renderer, OwnerPointer<RenderDataProvider> > DerivedType;
+      unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) );
+      new (slot) DerivedType( mRenderer, &Render::Renderer::SetRenderDataProvider, dataProvider );
+    }
 
-  if( mResendGeometry )
-  {
-    // The first call to GetRenderGeometry() creates the geometry and sends it in a message
-    RenderGeometry* geometry = mGeometry->GetRenderGeometry( mSceneController );
+    if( mResendFlag & RESEND_GEOMETRY )
+    {
+      typedef MessageValue1< Render::Renderer, Render::Geometry* > DerivedType;
+      unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) );
+      new (slot) DerivedType( mRenderer, &Render::Renderer::SetGeometry, mGeometry );
+    }
+
+    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 );
+    }
 
-    typedef MessageValue1< Render::Renderer, RenderGeometry* > DerivedType;
-    unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) );
+    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 );
+    }
 
-    new (slot) DerivedType( mRenderer, &Render::Renderer::SetGeometry, geometry );
-    mResendGeometry = false;
+    if( mResendFlag & RESEND_BLEND_COLOR )
+    {
+      typedef MessageValue1< Render::Renderer, Vector4 > DerivedType;
+      unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) );
+      new (slot) DerivedType( mRenderer, &Render::Renderer::SetBlendColor, GetBlendColor() );
+    }
+
+    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_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_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_RENDER_MODE )
+    {
+      typedef MessageValue1< Render::Renderer, RenderMode::Type > DerivedType;
+      unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) );
+      new (slot) DerivedType( mRenderer, &Render::Renderer::SetRenderMode, mStencilParameters.renderMode );
+    }
+
+    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 );
+    }
+
+    mResendFlag = 0;
   }
 }
 
-void Renderer::SetMaterial( BufferIndex bufferIndex, Material* material)
+void Renderer::SetTextures( TextureSet* textureSet )
 {
-  DALI_ASSERT_DEBUG( material != NULL && "Material pointer is NULL" );
+  DALI_ASSERT_DEBUG( textureSet != NULL && "Texture set pointer is NULL" );
 
-  mMaterial = material;
-  mMaterial->AddConnectionObserver( *this );
-  mRegenerateUniformMap = REGENERATE_UNIFORM_MAP;
+  if( mTextureSet )
+  {
+    mTextureSet->RemoveObserver(this);
+  }
 
-  mResendDataProviders = true;
+  mTextureSet = textureSet;
+  mTextureSet->AddObserver( this );
+  mRegenerateUniformMap = REGENERATE_UNIFORM_MAP;
+  mResendFlag |= RESEND_DATA_PROVIDER;
 }
 
-void Renderer::SetGeometry( BufferIndex bufferIndex, Geometry* geometry)
+void Renderer::SetShader( Shader* shader )
 {
-  DALI_ASSERT_DEBUG( geometry != NULL && "Geometry pointer is NULL");
-  if( mGeometry)
+  DALI_ASSERT_DEBUG( shader != NULL && "Shader pointer is NULL" );
+
+  if( mShader )
   {
-    mGeometry->RemoveConnectionObserver(*this);
-    mGeometry->OnRendererDisconnect();
+    mShader->RemoveConnectionObserver(*this);
   }
 
-  mGeometry = geometry;
-  mGeometry->AddConnectionObserver( *this ); // Observe geometry connections / uniform mapping changes
+  mShader = shader;
+  mShader->AddConnectionObserver( *this );
   mRegenerateUniformMap = REGENERATE_UNIFORM_MAP;
+  mResendFlag |= RESEND_DATA_PROVIDER;
+}
+
+void Renderer::SetGeometry( Render::Geometry* geometry )
+{
+  DALI_ASSERT_DEBUG( geometry != NULL && "Geometry pointer is NULL");
+  mGeometry = geometry;
 
   if( mRenderer )
   {
-    mResendGeometry = true;
+    mResendFlag |= RESEND_GEOMETRY;
   }
 }
 
@@ -233,35 +399,129 @@ void Renderer::SetDepthIndex( int depthIndex )
   mDepthIndex = depthIndex;
 }
 
-//Called when a node with this renderer is added to the stage
-void Renderer::OnStageConnect()
+void Renderer::SetFaceCullingMode( FaceCullingMode::Type faceCullingMode )
 {
-  ++mReferenceCount;
-  if( !mRenderer)
-  {
-    RenderDataProvider* dataProvider = NewRenderDataProvider();
+  mFaceCullingMode = faceCullingMode;
+  mResendFlag |= RESEND_FACE_CULLING_MODE;
+}
+
+void Renderer::SetBlendMode( BlendMode::Type blendingMode )
+{
+  mBlendMode = blendingMode;
+}
 
-    RenderGeometry* renderGeometry = mGeometry->GetRenderGeometry(mSceneController);
-    mRenderer = Render::Renderer::New( dataProvider, renderGeometry );
-    mSceneController->GetRenderMessageDispatcher().AddRenderer( *mRenderer );
-    mResendDataProviders = false;
-    mResendGeometry = false;
+void Renderer::SetBlendingOptions( unsigned int options )
+{
+  if( mBlendBitmask != options)
+  {
+    mBlendBitmask = options;
+    mResendFlag |= RESEND_BLEND_BIT_MASK;
   }
 }
 
-//Called when the node with this renderer has gone out of the stage
-void Renderer::OnStageDisconnect()
+void Renderer::SetBlendColor( const Vector4& blendColor )
 {
-  --mReferenceCount;
-  if( mReferenceCount == 0 )
+  if( blendColor == Color::TRANSPARENT )
   {
-    mSceneController->GetRenderMessageDispatcher().RemoveRenderer( *mRenderer );
-    if( mGeometry )
+    mBlendColor = NULL;
+  }
+  else
+  {
+    if( !mBlendColor )
     {
-      mGeometry->OnRendererDisconnect();
+      mBlendColor = new Vector4( blendColor );
+    }
+    else
+    {
+      *mBlendColor = blendColor;
     }
-    mRenderer = NULL;
   }
+
+  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;
+}
+
+void Renderer::SetDepthWriteMode( DepthWriteMode::Type depthWriteMode )
+{
+  mDepthWriteMode = depthWriteMode;
+  mResendFlag |= RESEND_DEPTH_WRITE_MODE;
+}
+
+void Renderer::SetDepthTestMode( DepthTestMode::Type depthTestMode )
+{
+  mDepthTestMode = depthTestMode;
+  mResendFlag |= RESEND_DEPTH_TEST_MODE;
+}
+
+void Renderer::SetDepthFunction( DepthFunction::Type depthFunction )
+{
+  mDepthFunction = depthFunction;
+  mResendFlag |= RESEND_DEPTH_FUNCTION;
+}
+
+void Renderer::SetRenderMode( RenderMode::Type mode )
+{
+  mStencilParameters.renderMode = mode;
+  mResendFlag |= RESEND_RENDER_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;
 }
 
 //Called when SceneGraph::Renderer is added to update manager ( that happens when an "event-thread renderer" is created )
@@ -269,8 +529,14 @@ void Renderer::ConnectToSceneGraph( SceneController& sceneController, BufferInde
 {
   mRegenerateUniformMap = REGENERATE_UNIFORM_MAP;
   mSceneController = &sceneController;
-}
+  RenderDataProvider* dataProvider = NewRenderDataProvider();
+
+  mRenderer = Render::Renderer::New( dataProvider, mGeometry, mBlendBitmask, GetBlendColor(), static_cast< FaceCullingMode::Type >( mFaceCullingMode ),
+                                         mPremultipledAlphaEnabled, mDepthWriteMode, mDepthTestMode, mDepthFunction, mStencilParameters );
 
+  OwnerPointer< Render::Renderer > transferOwnership( mRenderer );
+  mSceneController->GetRenderMessageDispatcher().AddRenderer( transferOwnership );
+}
 
 //Called just before destroying the scene-graph renderer ( when the "event-thread renderer" is no longer referenced )
 void Renderer::DisconnectFromSceneGraph( SceneController& sceneController, BufferIndex bufferIndex )
@@ -280,30 +546,41 @@ void Renderer::DisconnectFromSceneGraph( SceneController& sceneController, Buffe
   {
     mSceneController->GetRenderMessageDispatcher().RemoveRenderer( *mRenderer );
     mRenderer = NULL;
-    mSceneController = NULL;
   }
+  mSceneController = NULL;
 }
 
 RenderDataProvider* Renderer::NewRenderDataProvider()
 {
   RenderDataProvider* dataProvider = new RenderDataProvider();
 
-  dataProvider->mMaterialDataProvider = mMaterial;
   dataProvider->mUniformMapDataProvider = this;
-  dataProvider->mShader = mMaterial->GetShader();
+  dataProvider->mShader = mShader;
 
-  size_t textureCount( mMaterial->GetTextureCount() );
-  dataProvider->mTextures.resize( textureCount );
-  for( unsigned int i(0); i<textureCount; ++i )
+  if( mTextureSet )
   {
-    dataProvider->mTextures[i] = Render::Texture( mMaterial->GetTextureUniformName(i),
-                                                  mMaterial->GetTextureId(i),
-                                                  mMaterial->GetTextureSampler(i));
+    size_t textureCount = mTextureSet->GetTextureCount();
+    dataProvider->mTextures.resize( textureCount );
+    dataProvider->mSamplers.resize( textureCount );
+    for( unsigned int i(0); i<textureCount; ++i )
+    {
+      dataProvider->mTextures[i] = mTextureSet->GetTexture(i);
+      dataProvider->mSamplers[i] = mTextureSet->GetTextureSampler(i);
+    }
   }
 
   return dataProvider;
 }
 
+const Vector4& Renderer::GetBlendColor() const
+{
+  if( mBlendColor )
+  {
+    return *mBlendColor;
+  }
+  return Color::TRANSPARENT;
+}
+
 Render::Renderer& Renderer::GetRenderer()
 {
   return *mRenderer;
@@ -312,45 +589,62 @@ Render::Renderer& Renderer::GetRenderer()
 const CollectedUniformMap& Renderer::GetUniformMap( BufferIndex bufferIndex ) const
 {
   return mCollectedUniformMap[bufferIndex];
-};
-
-void Renderer::GetReadyAndComplete( bool& ready, bool& complete ) const
-{
-  ready = mResourcesReady;
-  complete = mFinishedResourceAcquisition;
 }
 
-// Called by ProcessRenderTasks after DoPrepareRender
-bool Renderer::IsFullyOpaque( BufferIndex updateBufferIndex, const Node& node ) const
+Renderer::Opacity Renderer::GetOpacity( BufferIndex updateBufferIndex, const Node& node ) const
 {
-  bool opaque = false;
+  Renderer::Opacity opacity = Renderer::OPAQUE;
 
-  if( mMaterial != NULL )
+  switch( mBlendMode )
   {
-    Material::BlendPolicy blendPolicy = mMaterial->GetBlendPolicy();
-    switch( blendPolicy )
+    case BlendMode::ON: // If the renderer should always be use blending
     {
-      case Material::OPAQUE:
-      {
-        opaque = true;
-        break;
-      }
-      case Material::TRANSPARENT:
+      opacity = Renderer::TRANSLUCENT;
+      break;
+    }
+    case BlendMode::AUTO:
+    {
+      bool shaderRequiresBlending( mShader->HintEnabled( Dali::Shader::Hint::OUTPUT_IS_TRANSPARENT ) );
+      if( shaderRequiresBlending || ( mTextureSet && mTextureSet->HasAlpha() ) )
       {
-        opaque = false;
-        break;
+        opacity = Renderer::TRANSLUCENT;
       }
-      case Material::USE_ACTOR_COLOR:
+      else // renderer should determine opacity using the actor color
       {
-        opaque = node.GetWorldColor( updateBufferIndex ).a >= FULLY_OPAQUE;
-        break;
+        float alpha = node.GetWorldColor( updateBufferIndex ).a;
+        if( alpha <= FULLY_TRANSPARENT )
+        {
+          opacity = TRANSPARENT;
+        }
+        else if( alpha <= FULLY_OPAQUE )
+        {
+          opacity = TRANSLUCENT;
+        }
       }
+      break;
+    }
+    case BlendMode::OFF: // the renderer should never use blending
+    default:
+    {
+      opacity = Renderer::OPAQUE;
+      break;
     }
   }
 
-  return opaque;
+  return opacity;
+}
+
+void Renderer::TextureSetChanged()
+{
+  mResendFlag |= RESEND_DATA_PROVIDER;
 }
 
+void Renderer::TextureSetDeleted()
+{
+  mTextureSet = NULL;
+
+  mResendFlag |= RESEND_DATA_PROVIDER;
+}
 void Renderer::ConnectionsChanged( PropertyOwner& object )
 {
   // One of our child objects has changed it's connections. Ensure the uniform
@@ -358,7 +652,7 @@ void Renderer::ConnectionsChanged( PropertyOwner& object )
   mRegenerateUniformMap = REGENERATE_UNIFORM_MAP;
 
   // Ensure the child object pointers get re-sent to the renderer
-  mResendDataProviders = true;
+  mResendFlag |= RESEND_DATA_PROVIDER;
 }
 
 void Renderer::ConnectedUniformMapChanged()
@@ -374,13 +668,9 @@ void Renderer::UniformMappingsChanged( const UniformMap& mappings )
 
 void Renderer::ObservedObjectDestroyed(PropertyOwner& owner)
 {
-  if( reinterpret_cast<PropertyOwner*>(mGeometry) == &owner )
-  {
-    mGeometry = NULL;
-  }
-  else if( reinterpret_cast<PropertyOwner*>(mMaterial) == &owner )
+  if( reinterpret_cast<PropertyOwner*>(mShader) == &owner )
   {
-    mMaterial = NULL;
+    mShader = NULL;
   }
 }