(Automated Tests) Sync with core tests

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

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp
index 083e582..6e2e204 100644 (file)
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-actor-utils.cpp
@@ -21,7 +21,6 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/dali-core.h>
 #include <dali/devel-api/images/texture-set-image.h>
 // EXTERNAL INCLUDES
 #include <dali/public-api/dali-core.h>
 #include <dali/devel-api/images/texture-set-image.h>

-#include <dali/devel-api/rendering/renderer.h>

 
 // INTERNAL INCLUDES
 #include "mesh-builder.h"
 
 // INTERNAL INCLUDES
 #include "mesh-builder.h"


@@ -31,6 +30,7 @@ namespace Dali
 
 namespace
 {
 
 namespace
 {

+

 const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
   attribute mediump vec2 aPosition;\n
   uniform mediump mat4 uMvpMatrix;\n
 const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
   attribute mediump vec2 aPosition;\n
   uniform mediump mat4 uMvpMatrix;\n


@@ -68,7 +68,7 @@ Actor CreateRenderableActor( Image texture )
 Actor CreateRenderableActor( Image texture, const std::string& vertexShader, const std::string& fragmentShader )
 {
   // Create the geometry
 Actor CreateRenderableActor( Image texture, const std::string& vertexShader, const std::string& fragmentShader )
 {
   // Create the geometry

-  Geometry geometry = Geometry::QUAD();
+  Geometry geometry = CreateQuadGeometry();

 
   // Create Shader
   Shader shader = Shader::New( vertexShader, fragmentShader );
 
   // Create Shader
   Shader shader = Shader::New( vertexShader, fragmentShader );