Revert "[3.0] Prevention of Null pointer dereference"

[platform/core/uifw/dali-core.git] / dali / internal / update / rendering / scene-graph-renderer.cpp

diff --git a/dali/internal/update/rendering/scene-graph-renderer.cpp b/dali/internal/update/rendering/scene-graph-renderer.cpp
index d1ca2e6..f004cc8 100644 (file)
--- a/dali/internal/update/rendering/scene-graph-renderer.cpp
+++ b/dali/internal/update/rendering/scene-graph-renderer.cpp
@@ -97,6 +97,8 @@ enum Flags
   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_FUNCTION = 1 << 9,
 };
 
 }
@@ -121,8 +123,10 @@ Renderer::Renderer()
  mShader( NULL ),
  mBlendColor( NULL ),
  mBlendBitmask( 0u ),
- mFaceCullingMode( Dali::Renderer::NONE ),
- mBlendingMode( Dali::BlendingMode::AUTO ),
+ mFaceCullingMode( FaceCullingMode::NONE ),
+ mBlendMode( BlendMode::AUTO ),
+ mDepthWriteMode( DepthWriteMode::AUTO ),
+ mDepthFunction( DepthFunction::LESS ),
  mIndexedDrawFirstElement( 0 ),
  mIndexedDrawElementsCount( 0 ),
  mReferenceCount( 0 ),
@@ -130,6 +134,7 @@ Renderer::Renderer()
  mResendFlag( 0 ),
  mResourcesReady( false ),
  mFinishedResourceAcquisition( false ),
+ mPremultipledAlphaEnabled(false),
  mDepthIndex( 0 )
 {
   mUniformMapChanged[0] = false;
@@ -191,11 +196,7 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex )
 
       const UniformMap& rendererUniformMap = PropertyOwner::GetUniformMap();
       AddMappings( localMap, rendererUniformMap );
-
-      if( mShader )
-      {
-        AddMappings( localMap, mShader->GetUniformMap() );
-      }
+      AddMappings( localMap, mShader->GetUniformMap() );
     }
     else if( mRegenerateUniformMap == COPY_UNIFORM_MAP )
     {
@@ -216,76 +217,82 @@ 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<RenderDataProvider> > DerivedType;
+      unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) );
+      new (slot) DerivedType( mRenderer, &Render::Renderer::SetRenderDataProvider, dataProvider );
+    }
 
-    typedef MessageValue1< Render::Renderer, OwnerPointer<RenderDataProvider> > 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 )
-  {
-    typedef MessageValue1< Render::Renderer, Render::Geometry* > DerivedType;
-    unsigned int* slot = mSceneController->GetRenderQueue().ReserveMessageSlot( updateBufferIndex, sizeof( DerivedType ) );
+      new (slot) DerivedType( mRenderer, &Render::Renderer::SetGeometry, mGeometry );
+    }
 
-    new (slot) DerivedType( mRenderer, &Render::Renderer::SetGeometry, mGeometry );
-    mResendFlag &= ~RESEND_GEOMETRY;
-  }
+    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 );
+    }
 
-  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_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_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_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_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_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_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_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_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 );
-    mResendFlag &= ~RESEND_INDEXED_DRAW_FIRST_ELEMENT;
-  }
+    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_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 );
-    mResendFlag &= ~RESEND_INDEXED_DRAW_FIRST_ELEMENT;
+    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_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 );
+    }
+
+    mResendFlag = 0;
   }
 }
 
@@ -335,15 +342,15 @@ void Renderer::SetDepthIndex( int depthIndex )
   mDepthIndex = depthIndex;
 }
 
-void Renderer::SetFaceCullingMode( unsigned int faceCullingMode )
+void Renderer::SetFaceCullingMode( FaceCullingMode::Type faceCullingMode )
 {
-  mFaceCullingMode = static_cast<Dali::Renderer::FaceCullingMode>(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 )
@@ -387,6 +394,18 @@ void Renderer::EnablePreMultipliedAlpha( bool preMultipled )
   mResendFlag |= RESEND_PREMULTIPLIED_ALPHA;
 }
 
+void Renderer::SetDepthWriteMode( DepthWriteMode::Type depthWriteMode )
+{
+  mDepthWriteMode = depthWriteMode;
+  mResendFlag |= RESEND_DEPTH_WRITE_MODE;
+}
+
+void Renderer::SetDepthFunction( DepthFunction::Type depthFunction )
+{
+  mDepthFunction = depthFunction;
+  mResendFlag |= RESEND_DEPTH_FUNCTION;
+}
+
 //Called when a node with this renderer is added to the stage
 void Renderer::OnStageConnect()
 {
@@ -397,8 +416,11 @@ void Renderer::OnStageConnect()
 
     mRenderer = Render::Renderer::New( dataProvider, mGeometry,
                                        mBlendBitmask, mBlendColor,
-                                       static_cast< Dali::Renderer::FaceCullingMode >( mFaceCullingMode ),
-                                       mPremultipledAlphaEnabled );
+                                       static_cast< FaceCullingMode::Type >( mFaceCullingMode ),
+                                       mPremultipledAlphaEnabled,
+                                       mDepthWriteMode,
+                                       mDepthFunction );
+
     mSceneController->GetRenderMessageDispatcher().AddRenderer( *mRenderer );
     mResendFlag = 0;
   }
@@ -476,16 +498,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;
@@ -504,7 +526,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;