[dali_1.2.30] Merge branch 'devel/master'

[platform/core/uifw/dali-core.git] / dali / internal / update / manager / render-task-processor.cpp

diff --git a/dali/internal/update/manager/render-task-processor.cpp b/dali/internal/update/manager/render-task-processor.cpp
index e620005..7e3447f 100644 (file)
--- a/dali/internal/update/manager/render-task-processor.cpp
+++ b/dali/internal/update/manager/render-task-processor.cpp
@@ -93,6 +93,7 @@ Layer* FindLayer( Node& node )
  * @param[in] currentLayer The current layer containing lists of opaque/transparent renderables.
  * @param[in] renderTask The current render-task.
  * @param[in] inheritedDrawMode The draw mode of the parent
+ * @param[in] parentDepthIndex The inherited parent node depth index
  * @param[in] currentClippingId The current Clipping Id
  *              Note: ClippingId is passed by reference, so it is permanently modified when traversing back up the tree for uniqueness.
  * @param[in] clippingDepth The current clipping depth
@@ -199,7 +200,6 @@ void RenderTaskProcessor::Process( BufferIndex updateBufferIndex,
                                    RenderTaskList& renderTasks,
                                    Layer& rootNode,
                                    SortedLayerPointers& sortedLayers,
-                                   GeometryBatcher& geometryBatcher,
                                    RenderInstructionContainer& instructions )
 {
   RenderTaskList::RenderTaskContainer& taskContainer = renderTasks.GetTasks();
@@ -228,8 +228,7 @@ void RenderTaskProcessor::Process( BufferIndex updateBufferIndex,
     RenderTask& renderTask = **iter;
 
     // Off screen only.
-    if( ( ( 0 == renderTask.GetFrameBufferId() ) && ( renderTask.GetFrameBuffer() == 0 ) ) ||
-        ( !renderTask.ReadyToRender( updateBufferIndex ) ) )
+    if( ( renderTask.GetFrameBuffer() == 0 ) || ( !renderTask.ReadyToRender( updateBufferIndex ) ) )
     {
       // Skip to next task.
       continue;
@@ -277,7 +276,6 @@ void RenderTaskProcessor::Process( BufferIndex updateBufferIndex,
                                   sortedLayers,
                                   renderTask,
                                   renderTask.GetCullMode(),
-                                  geometryBatcher,
                                   hasClippingNodes,
                                   instructions );
     }
@@ -297,9 +295,7 @@ void RenderTaskProcessor::Process( BufferIndex updateBufferIndex,
     RenderTask& renderTask = **iter;
 
     // On screen only.
-    if( ( 0 != renderTask.GetFrameBufferId() ) ||
-        ( renderTask.GetFrameBuffer() != 0 )   ||
-        ( !renderTask.ReadyToRender( updateBufferIndex ) ) )
+    if( ( renderTask.GetFrameBuffer() != 0 )   || ( !renderTask.ReadyToRender( updateBufferIndex ) ) )
     {
       // Skip to next task.
       continue;
@@ -345,7 +341,6 @@ void RenderTaskProcessor::Process( BufferIndex updateBufferIndex,
                                   sortedLayers,
                                   renderTask,
                                   renderTask.GetCullMode(),
-                                  geometryBatcher,
                                   hasClippingNodes,
                                   instructions );
     }