DirectRendering:

- Test harness changes

Change-Id: I7dce30ebec907fdb1e5ec182216927c0107c44fa

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-command-buffer.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-command-buffer.h
index 96b0021..407dade 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-command-buffer.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-command-buffer.h
@@ -65,6 +65,7 @@ enum class CommandType
   SET_DEPTH_COMPARE_OP    = 1 << 24,
   SET_DEPTH_TEST_ENABLE   = 1 << 25,
   SET_DEPTH_WRITE_ENABLE  = 1 << 26,
   SET_DEPTH_COMPARE_OP    = 1 << 24,
   SET_DEPTH_TEST_ENABLE   = 1 << 25,
   SET_DEPTH_WRITE_ENABLE  = 1 << 26,

+  DRAW_NATIVE             = 1 << 27,

 };
 
 std::ostream& operator<<(std::ostream& os, Graphics::StencilOp op);
 };
 
 std::ostream& operator<<(std::ostream& os, Graphics::StencilOp op);


@@ -123,7 +124,8 @@ struct DrawCallDescriptor
   {
     DRAW,
     DRAW_INDEXED,
   {
     DRAW,
     DRAW_INDEXED,

-    DRAW_INDEXED_INDIRECT
+    DRAW_INDEXED_INDIRECT,
+    DRAW_NATIVE

   };
 
   Type type{}; ///< Type of the draw call
   };
 
   Type type{}; ///< Type of the draw call


@@ -166,6 +168,11 @@ struct DrawCallDescriptor
       uint32_t                  drawCount;
       uint32_t                  stride;
     } drawIndexedIndirect;
       uint32_t                  drawCount;
       uint32_t                  stride;
     } drawIndexedIndirect;

+
+    struct
+    {
+      Graphics::DrawNativeInfo drawNativeInfo;
+    } drawNative;

   };
 };
 
   };
 };
 


@@ -265,6 +272,12 @@ struct Command
         data.bindUniformBuffers = rhs.data.bindUniformBuffers;
         break;
       }
         data.bindUniformBuffers = rhs.data.bindUniformBuffers;
         break;
       }

+      case CommandType::DRAW_NATIVE:
+      {
+        data.draw.type       = rhs.data.draw.type;
+        data.draw.drawNative = rhs.data.draw.drawNative;
+        break;
+      }

       case CommandType::DRAW:
       {
         data.draw.type = rhs.data.draw.type;
       case CommandType::DRAW:
       {
         data.draw.type = rhs.data.draw.type;


@@ -418,6 +431,12 @@ struct Command
         data.bindPipeline = rhs.data.bindPipeline;
         break;
       }
         data.bindPipeline = rhs.data.bindPipeline;
         break;
       }

+      case CommandType::DRAW_NATIVE:
+      {
+        data.draw.type       = rhs.data.draw.type;
+        data.draw.drawNative = rhs.data.draw.drawNative;
+        break;
+      }

       case CommandType::DRAW:
       {
         data.draw.type = rhs.data.draw.type;
       case CommandType::DRAW:
       {
         data.draw.type = rhs.data.draw.type;


@@ -800,6 +819,16 @@ public:
     mCallStack.PushCall("ExecuteCommandBuffers", "");
   }
 
     mCallStack.PushCall("ExecuteCommandBuffers", "");
   }
 

+  void DrawNative(const Graphics::DrawNativeInfo* drawInfo)
+  {
+    mCommands.emplace_back();
+    mCommands.back().type         = CommandType::DRAW_NATIVE;
+    auto& cmd                     = mCommands.back().data.draw;
+    cmd.type                      = DrawCallDescriptor::Type::DRAW_NATIVE;
+    cmd.drawNative.drawNativeInfo = *drawInfo;
+    mCallStack.PushCall("DrawNative", "");
+  }
+

   void Draw(
     uint32_t vertexCount,
     uint32_t instanceCount,
   void Draw(
     uint32_t vertexCount,
     uint32_t instanceCount,

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp
index bedce18..6a8eab4 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-graphics-controller.cpp
@@ -693,6 +693,12 @@ void TestGraphicsController::ProcessCommandBuffer(TestGraphicsCommandBuffer& com
         BindPipeline(currentPipeline);
         break;
       }
         BindPipeline(currentPipeline);
         break;
       }

+      case CommandType::DRAW_NATIVE:
+      {
+        auto info = &cmd.data.draw.drawNative.drawNativeInfo;
+        CallbackBase::ExecuteReturn<bool>(*info->callback, info->userData);
+        break;
+      }

       case CommandType::DRAW:
       {
         if(currentPipeline)
       case CommandType::DRAW:
       {
         if(currentPipeline)