(Partial update) Reset the updated flag after calculating the update area

[platform/core/uifw/dali-core.git] / dali / internal / render / common / render-manager.cpp

diff --git a/dali/internal/render/common/render-manager.cpp b/dali/internal/render/common/render-manager.cpp
index 91cb4c5..8db070b 100644 (file)
--- a/dali/internal/render/common/render-manager.cpp
+++ b/dali/internal/render/common/render-manager.cpp
@@ -28,6 +28,7 @@
 #include <dali/internal/event/common/scene-impl.h>
 
 #include <dali/internal/update/common/scene-graph-scene.h>
+#include <dali/internal/update/nodes/scene-graph-layer.h>
 #include <dali/internal/update/render-tasks/scene-graph-camera.h>
 
 #include <dali/internal/render/common/render-algorithms.h>
@@ -491,8 +492,9 @@ void RenderManager::PreRender(Integration::Scene& scene, std::vector<Rect<int>>&
   class DamagedRectsCleaner
   {
   public:
-    explicit DamagedRectsCleaner(std::vector<Rect<int>>& damagedRects)
+    explicit DamagedRectsCleaner(std::vector<Rect<int>>& damagedRects, Rect<int>& surfaceRect)
     : mDamagedRects(damagedRects),
+      mSurfaceRect(surfaceRect),
       mCleanOnReturn(true)
     {
     }
@@ -507,18 +509,20 @@ void RenderManager::PreRender(Integration::Scene& scene, std::vector<Rect<int>>&
       if(mCleanOnReturn)
       {
         mDamagedRects.clear();
+        mDamagedRects.push_back(mSurfaceRect);
       }
     }
 
   private:
     std::vector<Rect<int>>& mDamagedRects;
+    Rect<int>               mSurfaceRect;
     bool                    mCleanOnReturn;
   };
 
   Rect<int32_t> surfaceRect = sceneObject->GetSurfaceRect();
 
   // Clean collected dirty/damaged rects on exit if 3d layer or 3d node or other conditions.
-  DamagedRectsCleaner damagedRectCleaner(damagedRects);
+  DamagedRectsCleaner damagedRectCleaner(damagedRects, surfaceRect);
 
   // Mark previous dirty rects in the sorted array. The array is already sorted by node and renderer, frame number.
   // so you don't need to sort: std::stable_sort(itemsDirtyRects.begin(), itemsDirtyRects.end());
@@ -611,7 +615,6 @@ void RenderManager::PreRender(Integration::Scene& scene, std::vector<Rect<int>>&
                 (item.mNode->Updated() || (item.mRenderer && item.mRenderer->Updated(mImpl->renderBufferIndex, item.mNode)))))
             {
               item.mIsUpdated = false;
-              item.mNode->SetUpdatedTree(false);
 
               rect = RenderItem::CalculateViewportSpaceAABB(item.mModelViewMatrix, item.mUpdateSize, viewportRect.width, viewportRect.height);
               if(rect.IsValid() && rect.Intersect(viewportRect) && !rect.IsEmpty())
@@ -674,6 +677,9 @@ void RenderManager::PreRender(Integration::Scene& scene, std::vector<Rect<int>>&
             }
           }
         }
+
+        // Reset updated flag from the root
+        renderList->GetSourceLayer()->SetUpdatedTree(false);
       }
     }
   }
@@ -707,6 +713,12 @@ void RenderManager::RenderScene(Integration::RenderStatus& status, Integration::
 
 void RenderManager::RenderScene(Integration::RenderStatus& status, Integration::Scene& scene, bool renderToFbo, Rect<int>& clippingRect)
 {
+  if(mImpl->partialUpdateAvailable == Integration::PartialUpdateAvailable::TRUE && !renderToFbo && clippingRect.IsEmpty())
+  {
+    // ClippingRect is empty. Skip rendering
+    return;
+  }
+
   // Reset main algorithms command buffer
   mImpl->renderAlgorithms.ResetCommandBuffer();
 
@@ -719,6 +731,15 @@ void RenderManager::RenderScene(Integration::RenderStatus& status, Integration::
 
   std::vector<Graphics::RenderTarget*> targetstoPresent;
 
+  Rect<int32_t> surfaceRect = sceneObject->GetSurfaceRect();
+  if(clippingRect == surfaceRect)
+  {
+    // Full rendering case
+    // Make clippingRect empty because we're doing full rendering now if the clippingRect is empty.
+    // To reduce side effects, keep this logic now.
+    clippingRect = Rect<int>();
+  }
+
   for(uint32_t i = 0; i < count; ++i)
   {
     RenderInstruction& instruction = sceneObject->GetRenderInstructions().At(mImpl->renderBufferIndex, i);
@@ -733,8 +754,7 @@ void RenderManager::RenderScene(Integration::RenderStatus& status, Integration::
 
     Rect<int32_t> viewportRect;
 
-    Rect<int32_t> surfaceRect        = sceneObject->GetSurfaceRect();
-    int32_t       surfaceOrientation = sceneObject->GetSurfaceOrientation();
+    int32_t surfaceOrientation = sceneObject->GetSurfaceOrientation();
 
     // @todo Should these be part of scene?
     Integration::DepthBufferAvailable   depthBufferAvailable   = mImpl->depthBufferAvailable;