X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fupdate%2Fmanager%2Frender-instruction-processor.cpp;h=204a472f3f712e61a8e0422247e5bf381c95d3be;hb=334f6b0076e89e77baf29fe67e05de62783dbd6c;hp=2a45987ab05e789a7ef6bc692e2bd9ef903022c9;hpb=1219dfc5560235ea073aeee57bec8299806cadb1;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/internal/update/manager/render-instruction-processor.cpp b/dali/internal/update/manager/render-instruction-processor.cpp
old mode 100755
new mode 100644
index 2a45987..204a472
--- a/dali/internal/update/manager/render-instruction-processor.cpp
+++ b/dali/internal/update/manager/render-instruction-processor.cpp
@@ -33,7 +33,6 @@
 #include <dali/internal/render/renderers/render-renderer.h>
 #include <dali/internal/render/renderers/render-property-buffer.h>
 #include <dali/internal/update/nodes/scene-graph-layer.h>
-#include <dali/internal/common/math.h>
 
 namespace
 {
@@ -162,8 +161,8 @@ inline void AddRendererToRenderList( BufferIndex updateBufferIndex,
 {
   bool inside( true );
   Node* node = renderable.mNode;
-  bool geomertryModified = false;
-  if( cull && renderable.mRenderer && !( geomertryModified = renderable.mRenderer->GetShader().HintEnabled( Dali::Shader::Hint::MODIFIES_GEOMETRY ) ) )
+
+  if( cull && renderable.mRenderer && !renderable.mRenderer->GetShader().HintEnabled( Dali::Shader::Hint::MODIFIES_GEOMETRY ) )
   {
     const Vector4& boundingSphere = node->GetBoundingSphere();
     inside = ( boundingSphere.w > Math::MACHINE_EPSILON_1000 ) &&
@@ -181,27 +180,17 @@ inline void AddRendererToRenderList( BufferIndex updateBufferIndex,
       item.mNode = renderable.mNode;
       item.mIsOpaque = ( opacityType == Renderer::OPAQUE );
       item.mDepthIndex = 0;
-      item.mPartialUpdateEnabled = false;
 
-      if( !isLayer3d )
+      if(!isLayer3d)
       {
         item.mDepthIndex = renderable.mNode->GetDepthIndex();
       }
-      if( isLayer3d || geomertryModified )
-      {
-        renderList.SetPartialUpdateEnabled( false );
-      }
 
       if( DALI_LIKELY( renderable.mRenderer ) )
       {
         item.mRenderer =   &renderable.mRenderer->GetRenderer();
         item.mTextureSet =  renderable.mRenderer->GetTextures();
         item.mDepthIndex += renderable.mRenderer->GetDepthIndex();
-
-        if( FaceCullingMode::NONE != renderable.mRenderer->GetFaceCullingMode() )
-        {
-          renderList.SetPartialUpdateEnabled( false );
-        }
       }
       else
       {
@@ -212,28 +201,13 @@ inline void AddRendererToRenderList( BufferIndex updateBufferIndex,
       node->GetWorldMatrixAndSize( item.mModelMatrix, item.mSize );
 
       Matrix::Multiply( item.mModelViewMatrix, item.mModelMatrix, viewMatrix );
-
-      if( node->IsPartialUpdateAvailable() && DALI_LIKELY( item.mRenderer ) && renderList.IsPartialUpdateEnabled() )
-      {
-        if( node->IsComponentChanged() || node->IsPropertyDirty() )
-        {
-          item.mPartialUpdateEnabled = true;
-
-          item.mUpdateSizeHint = item.mSize;
-          Vector3 updateSizeHint = Vector3::ZERO;
-          node->GetUpdateSizeHint( updateBufferIndex, updateSizeHint );
-          if( updateSizeHint != Vector3::ZERO )
-          {
-            item.mUpdateSizeHint = updateSizeHint;
-          }
-        }
-      }
     }
-    node->SetCulled( updateBufferIndex, false );
+
+     node->SetCulled( updateBufferIndex, false );
   }
   else
   {
-    node->SetCulled( updateBufferIndex, true );
+     node->SetCulled( updateBufferIndex, true );
   }
 }
 
@@ -460,10 +434,6 @@ void RenderInstructionProcessor::Prepare( BufferIndex updateBufferIndex,
       if( !SetupRenderList( renderables, layer, instruction, tryReuseRenderList, &renderList ) )
       {
         renderList->SetHasColorRenderItems( true );
-        if( !isLayer3D )
-        {
-          renderList->SetPartialUpdateEnabled( true );
-        }
         AddRenderersToRenderList( updateBufferIndex,
                                   *renderList,
                                   renderables,
@@ -486,10 +456,6 @@ void RenderInstructionProcessor::Prepare( BufferIndex updateBufferIndex,
       if( !SetupRenderList( renderables, layer, instruction, tryReuseRenderList, &renderList ) )
       {
         renderList->SetHasColorRenderItems( false );
-        if( !isLayer3D )
-        {
-          renderList->SetPartialUpdateEnabled( true );
-        }
         AddRenderersToRenderList( updateBufferIndex,
                                   *renderList,
                                   renderables,