X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=dali%2Finternal%2Fupdate%2Fmanager%2Frender-instruction-processor.cpp;h=2a45987ab05e789a7ef6bc692e2bd9ef903022c9;hb=1eb0148fe7c5dbd58d8e3bf364cbab9e65167609;hp=d1c332cf7469392385ac3123ffc08b5d76cb0e60;hpb=cd0ce6e412df8961b1a5e28b496369fa49fd72d7;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 100644
new mode 100755
index d1c332c..2a45987
--- a/dali/internal/update/manager/render-instruction-processor.cpp
+++ b/dali/internal/update/manager/render-instruction-processor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -33,6 +33,7 @@
 #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
 {
@@ -161,8 +162,8 @@ inline void AddRendererToRenderList( BufferIndex updateBufferIndex,
 {
   bool inside( true );
   Node* node = renderable.mNode;
-
-  if( cull && renderable.mRenderer && !renderable.mRenderer->GetShader().HintEnabled( Dali::Shader::Hint::MODIFIES_GEOMETRY ) )
+  bool geomertryModified = false;
+  if( cull && renderable.mRenderer && !( geomertryModified = renderable.mRenderer->GetShader().HintEnabled( Dali::Shader::Hint::MODIFIES_GEOMETRY ) ) )
   {
     const Vector4& boundingSphere = node->GetBoundingSphere();
     inside = ( boundingSphere.w > Math::MACHINE_EPSILON_1000 ) &&
@@ -180,17 +181,27 @@ 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
       {
@@ -201,13 +212,28 @@ inline void AddRendererToRenderList( BufferIndex updateBufferIndex,
       node->GetWorldMatrixAndSize( item.mModelMatrix, item.mSize );
 
       Matrix::Multiply( item.mModelViewMatrix, item.mModelMatrix, viewMatrix );
-    }
 
-     node->SetCulled( updateBufferIndex, false );
+      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 );
   }
   else
   {
-     node->SetCulled( updateBufferIndex, true );
+    node->SetCulled( updateBufferIndex, true );
   }
 }
 
@@ -408,6 +434,7 @@ void RenderInstructionProcessor::Prepare( BufferIndex updateBufferIndex,
   renderTask.PrepareRenderInstruction( instruction, updateBufferIndex );
   bool viewMatrixHasNotChanged = !renderTask.ViewMatrixUpdated();
   bool isRenderListAdded = false;
+  bool isRootLayerDirty = false;
 
   const Matrix& viewMatrix = renderTask.GetViewMatrix( updateBufferIndex );
   SceneGraph::Camera& camera = renderTask.GetCamera();
@@ -420,6 +447,12 @@ void RenderInstructionProcessor::Prepare( BufferIndex updateBufferIndex,
     const bool isLayer3D = layer.GetBehavior() == Dali::Layer::LAYER_3D;
     RenderList* renderList = NULL;
 
+    if( layer.IsRoot() && ( layer.GetDirtyFlags() != NodePropertyFlags::NOTHING ) )
+    {
+      // If root-layer & dirty, i.e. a property has changed or a child has been deleted, then we need to ensure we render once more
+      isRootLayerDirty = true;
+    }
+
     if( !layer.colorRenderables.Empty() )
     {
       RenderableContainer& renderables = layer.colorRenderables;
@@ -427,6 +460,10 @@ void RenderInstructionProcessor::Prepare( BufferIndex updateBufferIndex,
       if( !SetupRenderList( renderables, layer, instruction, tryReuseRenderList, &renderList ) )
       {
         renderList->SetHasColorRenderItems( true );
+        if( !isLayer3D )
+        {
+          renderList->SetPartialUpdateEnabled( true );
+        }
         AddRenderersToRenderList( updateBufferIndex,
                                   *renderList,
                                   renderables,
@@ -449,6 +486,10 @@ void RenderInstructionProcessor::Prepare( BufferIndex updateBufferIndex,
       if( !SetupRenderList( renderables, layer, instruction, tryReuseRenderList, &renderList ) )
       {
         renderList->SetHasColorRenderItems( false );
+        if( !isLayer3D )
+        {
+          renderList->SetPartialUpdateEnabled( true );
+        }
         AddRenderersToRenderList( updateBufferIndex,
                                   *renderList,
                                   renderables,
@@ -468,7 +509,7 @@ void RenderInstructionProcessor::Prepare( BufferIndex updateBufferIndex,
   // Inform the render instruction that all renderers have been added and this frame is complete.
   instruction.UpdateCompleted();
 
-  if( !isRenderListAdded && !instruction.mIsClearColorSet )
+  if( !isRenderListAdded && !instruction.mIsClearColorSet && !isRootLayerDirty )
   {
     instructions.DiscardCurrentInstruction( updateBufferIndex );
   }