Syncing test harness

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / dali-toolkit-test-utils / test-graphics-command-buffer.cpp

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-command-buffer.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-command-buffer.cpp
index 70f3f0e..e34b852 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-command-buffer.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-command-buffer.cpp
@@ -27,11 +27,11 @@ TestGraphicsCommandBuffer::TestGraphicsCommandBuffer(TraceCallStack& callstack,
 int TestGraphicsCommandBuffer::GetDrawCallsCount()
 {
   int count = 0;
-  for( auto& cmd : mCommands )
+  for(auto& cmd : mCommands)
   {
-    if( cmd.type == CommandType::DRAW ||
-      cmd.type == CommandType::DRAW_INDEXED ||
-      cmd.type == CommandType::DRAW_INDEXED_INDIRECT )
+    if(cmd.type == CommandType::DRAW ||
+       cmd.type == CommandType::DRAW_INDEXED ||
+       cmd.type == CommandType::DRAW_INDEXED_INDIRECT)
     {
       ++count;
     }
@@ -39,18 +39,18 @@ int TestGraphicsCommandBuffer::GetDrawCallsCount()
   return count;
 }
 
-void TestGraphicsCommandBuffer::GetStateForDrawCall( int drawCallIndex )
+void TestGraphicsCommandBuffer::GetStateForDrawCall(int drawCallIndex)
 {
-  int index = 0;
+  int                  index = 0;
   std::vector<Command> mCommandStack{};
-  for( auto& cmd : mCommands )
+  for(auto& cmd : mCommands)
   {
     mCommandStack.push_back(cmd);
-    if( cmd.type == CommandType::DRAW ||
-        cmd.type == CommandType::DRAW_INDEXED ||
-        cmd.type == CommandType::DRAW_INDEXED_INDIRECT )
+    if(cmd.type == CommandType::DRAW ||
+       cmd.type == CommandType::DRAW_INDEXED ||
+       cmd.type == CommandType::DRAW_INDEXED_INDIRECT)
     {
-      if( index == drawCallIndex )
+      if(index == drawCallIndex)
       {
         break;
       }
@@ -60,14 +60,37 @@ void TestGraphicsCommandBuffer::GetStateForDrawCall( int drawCallIndex )
   }
 }
 
-std::vector<Command*> TestGraphicsCommandBuffer::GetCommandsByType( CommandTypeMask mask )
+std::vector<const Command*> TestGraphicsCommandBuffer::GetCommandsByType(CommandTypeMask mask) const
 {
-  std::vector<Command*> mCommandStack{};
-  for( auto& cmd : mCommands )
+  std::vector<const Command*> mCommandStack{};
+  for(auto& cmd : mCommands)
   {
-    if(uint32_t(cmd.type) == (mask & uint32_t(cmd.type)) )
+    if(uint32_t(cmd.type) == (mask & uint32_t(cmd.type)))
     {
-      mCommandStack.emplace_back( &cmd );
+      mCommandStack.emplace_back(&cmd);
+    }
+  }
+  return mCommandStack;
+}
+
+std::vector<const Command*> TestGraphicsCommandBuffer::GetChildCommandsByType(CommandTypeMask mask) const
+{
+  std::vector<const Command*> mCommandStack{};
+  for(auto& cmd : mCommands)
+  {
+    if(uint32_t(cmd.type) == (mask & uint32_t(cmd.type)))
+    {
+      mCommandStack.emplace_back(&cmd);
+    }
+    if(cmd.type == CommandType::EXECUTE_COMMAND_BUFFERS)
+    {
+      for(auto secondaryCB : cmd.data.executeCommandBuffers.buffers)
+      {
+        for(auto command : secondaryCB->GetChildCommandsByType(mask))
+        {
+          mCommandStack.push_back(command);
+        }
+      }
     }
   }
   return mCommandStack;