X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali%2Finternal%2Fupdate%2Frendering%2Fscene-graph-renderer.cpp;h=169be5c82172fe90d257d7a1d9a0451434811913;hb=52d6f9b02130f5e824ebebc919cecbc487605cac;hp=b7180cb6457691f857083ca0cebe0fa56e2d4a9b;hpb=e828eac25aeb6b01678b672db91df72e1ead2751;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
old mode 100755
new mode 100644
index b7180cb..169be5c
--- a/dali/internal/update/rendering/scene-graph-renderer.cpp
+++ b/dali/internal/update/rendering/scene-graph-renderer.cpp
@@ -143,7 +143,6 @@ Renderer::Renderer()
   mDepthTestMode( DepthTestMode::AUTO ),
   mRenderingBehavior( DevelRenderer::Rendering::IF_REQUIRED ),
   mPremultipledAlphaEnabled( false ),
-  mDirty( false ),
   mOpacity( 1.0f ),
   mDepthIndex( 0 )
 {
@@ -176,14 +175,12 @@ void Renderer::operator delete( void* ptr )
 
 void Renderer::PrepareRender( BufferIndex updateBufferIndex )
 {
-  SetDirty( false );
   if( mRegenerateUniformMap == UNIFORM_MAP_READY )
   {
     mUniformMapChanged[updateBufferIndex] = false;
   }
   else
   {
-    mDirty = true;
     if( mRegenerateUniformMap == REGENERATE_UNIFORM_MAP)
     {
       CollectedUniformMap& localMap = mCollectedUniformMap[ updateBufferIndex ];
@@ -218,7 +215,6 @@ void Renderer::PrepareRender( BufferIndex updateBufferIndex )
 
   if( mResendFlag != 0 )
   {
-    mDirty = true;
     if( mResendFlag & RESEND_GEOMETRY )
     {
       typedef MessageValue1< Render::Renderer, Render::Geometry* > DerivedType;
@@ -399,7 +395,6 @@ void Renderer::SetGeometry( Render::Geometry* geometry )
 void Renderer::SetDepthIndex( int depthIndex )
 {
   mDepthIndex = depthIndex;
-  mDirty = true;
 }
 
 void Renderer::SetFaceCullingMode( FaceCullingMode::Type faceCullingMode )
@@ -416,7 +411,6 @@ FaceCullingMode::Type Renderer::GetFaceCullingMode() const
 void Renderer::SetBlendMode( BlendMode::Type blendingMode )
 {
   mBlendMode = blendingMode;
-  mDirty = true;
 }
 
 BlendMode::Type Renderer::GetBlendMode() const
@@ -589,7 +583,6 @@ const Render::Renderer::StencilParameters& Renderer::GetStencilParameters() cons
 
 void Renderer::BakeOpacity( BufferIndex updateBufferIndex, float opacity )
 {
-  mDirty = true;
   mOpacity.Bake( updateBufferIndex, opacity );
 }
 
@@ -601,7 +594,6 @@ float Renderer::GetOpacity( BufferIndex updateBufferIndex ) const
 void Renderer::SetRenderingBehavior( DevelRenderer::Rendering::Type renderingBehavior )
 {
   mRenderingBehavior = renderingBehavior;
-  mDirty = true;
 }
 
 DevelRenderer::Rendering::Type Renderer::GetRenderingBehavior() const
@@ -620,6 +612,7 @@ void Renderer::ConnectToSceneGraph( SceneController& sceneController, BufferInde
 
   mRenderer = Render::Renderer::New( mRenderDataProvider, mGeometry, mBlendBitmask, GetBlendColor(), static_cast< FaceCullingMode::Type >( mFaceCullingMode ),
                                          mPremultipledAlphaEnabled, mDepthWriteMode, mDepthTestMode, mDepthFunction, mStencilParameters );
+
   OwnerPointer< Render::Renderer > transferOwnership( mRenderer );
   mSceneController->GetRenderMessageDispatcher().AddRenderer( transferOwnership );
 }
@@ -657,7 +650,6 @@ void Renderer::UpdateTextureSet()
       mRenderDataProvider->mTextures.clear();
       mRenderDataProvider->mSamplers.clear();
     }
-    mDirty = true;
   }
 }
 
@@ -763,49 +755,6 @@ void Renderer::ObservedObjectDestroyed(PropertyOwner& owner)
   }
 }
 
-void Renderer::SetDirty( bool value )
-{
-  mDirty = value;
-  if( mShader )
-  {
-    mShader->SetPropertyDirty( value );
-  }
-}
-
-bool Renderer::IsDirty() const
-{
-  bool ret = false;
-
-  if( !mDirty )
-  {
-    if( mShader )
-    {
-      ret = mShader->IsPropertyDirty();
-    }
-
-    // check native image
-    if( !ret && mTextureSet )
-    {
-      uint32_t textureCount = mTextureSet->GetTextureCount();
-
-      if(textureCount > 0)
-      {
-        Dali::Internal::Render::Texture* texture;
-        for( uint32_t i = 0; i<textureCount; ++i )
-        {
-          texture = const_cast<Dali::Internal::SceneGraph::TextureSet *>(mTextureSet)->GetTexture(i);
-          if( texture && texture->IsNativeImage() )
-          {
-            ret = true;
-            break;
-          }
-        }
-      }
-    }
-  }
-  return ret | mDirty;
-}
-
 } // namespace SceneGraph
 } // namespace Internal
 } // namespace Dali