Fix SVACE error in render-manager.cpp

Change-Id: I4da240f713fef7777d5c653de52397e3f8cb9afc

diff --git a/dali/internal/render/common/render-manager.cpp b/dali/internal/render/common/render-manager.cpp
index 8db070b..ce6852b 100644 (file)
--- a/dali/internal/render/common/render-manager.cpp
+++ b/dali/internal/render/common/render-manager.cpp
@@ -595,49 +595,78 @@ void RenderManager::PreRender(Integration::Scene& scene, std::vector<Rect<int>>&
       for(RenderListContainer::SizeType index = 0u; index < count; ++index)
       {
         const RenderList* renderList = instruction.GetRenderList(index);
-        if(renderList && !renderList->IsEmpty())
+        if(renderList)
         {
-          const std::size_t listCount = renderList->Count();
-          for(uint32_t listIndex = 0u; listIndex < listCount; ++listIndex)
+          if(!renderList->IsEmpty())
           {
-            RenderItem& item = renderList->GetItem(listIndex);
-            // If the item does 3D transformation, do early exit and clean the damaged rect array
-            if(item.mUpdateSize == Vector3::ZERO)
+            const std::size_t listCount = renderList->Count();
+            for(uint32_t listIndex = 0u; listIndex < listCount; ++listIndex)
             {
-              return;
-            }
+              RenderItem& item = renderList->GetItem(listIndex);
+              // If the item does 3D transformation, do early exit and clean the damaged rect array
+              if(item.mUpdateSize == Vector3::ZERO)
+              {
+                return;
+              }
 
-            Rect<int> rect;
-            DirtyRect dirtyRect(item.mNode, item.mRenderer, mImpl->frameCount, rect);
-            // If the item refers to updated node or renderer.
-            if(item.mIsUpdated ||
-               (item.mNode &&
-                (item.mNode->Updated() || (item.mRenderer && item.mRenderer->Updated(mImpl->renderBufferIndex, item.mNode)))))
-            {
-              item.mIsUpdated = false;
+              Rect<int> rect;
+              DirtyRect dirtyRect(item.mNode, item.mRenderer, mImpl->frameCount, rect);
+              // If the item refers to updated node or renderer.
+              if(item.mIsUpdated ||
+                 (item.mNode &&
+                  (item.mNode->Updated() || (item.mRenderer && item.mRenderer->Updated(mImpl->renderBufferIndex, item.mNode)))))
+              {
+                item.mIsUpdated = false;
 
-              rect = RenderItem::CalculateViewportSpaceAABB(item.mModelViewMatrix, item.mUpdateSize, viewportRect.width, viewportRect.height);
-              if(rect.IsValid() && rect.Intersect(viewportRect) && !rect.IsEmpty())
+                rect = RenderItem::CalculateViewportSpaceAABB(item.mModelViewMatrix, item.mUpdateSize, viewportRect.width, viewportRect.height);
+                if(rect.IsValid() && rect.Intersect(viewportRect) && !rect.IsEmpty())
+                {
+                  const int left   = rect.x;
+                  const int top    = rect.y;
+                  const int right  = rect.x + rect.width;
+                  const int bottom = rect.y + rect.height;
+                  rect.x           = (left / 16) * 16;
+                  rect.y           = (top / 16) * 16;
+                  rect.width       = ((right + 16) / 16) * 16 - rect.x;
+                  rect.height      = ((bottom + 16) / 16) * 16 - rect.y;
+
+                  // Found valid dirty rect.
+                  // 1. Insert it in the sorted array of the dirty rects.
+                  // 2. Mark the related dirty rects as visited so they will not be removed below.
+                  // 3. Keep only last 3 dirty rects for the same node and renderer (Tizen uses 3 back buffers, Ubuntu 1).
+                  dirtyRect.rect    = rect;
+                  auto dirtyRectPos = std::lower_bound(itemsDirtyRects.begin(), itemsDirtyRects.end(), dirtyRect);
+                  dirtyRectPos      = itemsDirtyRects.insert(dirtyRectPos, dirtyRect);
+
+                  int c = 1;
+                  while(++dirtyRectPos != itemsDirtyRects.end())
+                  {
+                    if(dirtyRectPos->node != item.mNode || dirtyRectPos->renderer != item.mRenderer)
+                    {
+                      break;
+                    }
+
+                    dirtyRectPos->visited = true;
+                    Rect<int>& dirtRect   = dirtyRectPos->rect;
+                    rect.Merge(dirtRect);
+
+                    c++;
+                    if(c > 3) // no more then 3 previous rects
+                    {
+                      itemsDirtyRects.erase(dirtyRectPos);
+                      break;
+                    }
+                  }
+
+                  damagedRects.push_back(rect);
+                }
+              }
+              else
               {
-                const int left   = rect.x;
-                const int top    = rect.y;
-                const int right  = rect.x + rect.width;
-                const int bottom = rect.y + rect.height;
-                rect.x           = (left / 16) * 16;
-                rect.y           = (top / 16) * 16;
-                rect.width       = ((right + 16) / 16) * 16 - rect.x;
-                rect.height      = ((bottom + 16) / 16) * 16 - rect.y;
-
-                // Found valid dirty rect.
-                // 1. Insert it in the sorted array of the dirty rects.
+                // 1. The item is not dirty, the node and renderer referenced by the item are still exist.
                 // 2. Mark the related dirty rects as visited so they will not be removed below.
-                // 3. Keep only last 3 dirty rects for the same node and renderer (Tizen uses 3 back buffers, Ubuntu 1).
-                dirtyRect.rect    = rect;
                 auto dirtyRectPos = std::lower_bound(itemsDirtyRects.begin(), itemsDirtyRects.end(), dirtyRect);
-                dirtyRectPos      = itemsDirtyRects.insert(dirtyRectPos, dirtyRect);
-
-                int c = 1;
-                while(++dirtyRectPos != itemsDirtyRects.end())
+                while(dirtyRectPos != itemsDirtyRects.end())
                 {
                   if(dirtyRectPos->node != item.mNode || dirtyRectPos->renderer != item.mRenderer)
                   {
@@ -645,41 +674,19 @@ void RenderManager::PreRender(Integration::Scene& scene, std::vector<Rect<int>>&
                   }
 
                   dirtyRectPos->visited = true;
-                  Rect<int>& dirtRect   = dirtyRectPos->rect;
-                  rect.Merge(dirtRect);
-
-                  c++;
-                  if(c > 3) // no more then 3 previous rects
-                  {
-                    itemsDirtyRects.erase(dirtyRectPos);
-                    break;
-                  }
+                  dirtyRectPos++;
                 }
-
-                damagedRects.push_back(rect);
               }
             }
-            else
-            {
-              // 1. The item is not dirty, the node and renderer referenced by the item are still exist.
-              // 2. Mark the related dirty rects as visited so they will not be removed below.
-              auto dirtyRectPos = std::lower_bound(itemsDirtyRects.begin(), itemsDirtyRects.end(), dirtyRect);
-              while(dirtyRectPos != itemsDirtyRects.end())
-              {
-                if(dirtyRectPos->node != item.mNode || dirtyRectPos->renderer != item.mRenderer)
-                {
-                  break;
-                }
+          }
 
-                dirtyRectPos->visited = true;
-                dirtyRectPos++;
-              }
-            }
+          // Reset updated flag from the root
+          Layer* sourceLayer = renderList->GetSourceLayer();
+          if(sourceLayer)
+          {
+            sourceLayer->SetUpdatedTree(false);
           }
         }
-
-        // Reset updated flag from the root
-        renderList->GetSourceLayer()->SetUpdatedTree(false);
       }
     }
   }