Use Geometry::QUAD() in UTC

Change-Id: I98b24f63730a7308f842cbb96dfb17964f97c68a

diff --git a/automated-tests/src/dali-devel/utc-Dali-Actor.cpp b/automated-tests/src/dali-devel/utc-Dali-Actor.cpp
index eef98f3..2dab3f2 100644 (file)
--- a/automated-tests/src/dali-devel/utc-Dali-Actor.cpp
+++ b/automated-tests/src/dali-devel/utc-Dali-Actor.cpp
@@ -34,7 +34,7 @@ int UtcDaliActorAddRendererP(void)
 
   DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
 
@@ -86,7 +86,7 @@ int UtcDaliActorAddRendererOnStage(void)
   application.SendNotification();
   application.Render(0);
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
 
@@ -115,7 +115,7 @@ int UtcDaliActorRemoveRendererP(void)
 
   DALI_TEST_EQUALS( actor.GetRendererCount(), 0u, TEST_LOCATION );
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
 

diff --git a/automated-tests/src/dali-devel/utc-Dali-Renderer.cpp b/automated-tests/src/dali-devel/utc-Dali-Renderer.cpp
index 7c93806..243d2ac 100644 (file)
--- a/automated-tests/src/dali-devel/utc-Dali-Renderer.cpp
+++ b/automated-tests/src/dali-devel/utc-Dali-Renderer.cpp
@@ -57,7 +57,7 @@ int UtcDaliRendererNew01(void)
 {
   TestApplication application;
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
 
@@ -77,7 +77,7 @@ int UtcDaliRendererCopyConstructor(void)
 {
   TestApplication application;
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
 
@@ -91,7 +91,7 @@ int UtcDaliRendererAssignmentOperator(void)
 {
   TestApplication application;
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
 
@@ -107,7 +107,7 @@ int UtcDaliRendererDownCast01(void)
 {
   TestApplication application;
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New(geometry, shader);
 
@@ -132,8 +132,8 @@ int UtcDaliRendererSetGetGeometry(void)
   TestApplication application;
   tet_infoline( "Test SetGeometry, GetGeometry" );
 
-  Geometry geometry1 = CreateQuadGeometry();
-  Geometry geometry2 = CreateQuadGeometry();
+  Geometry geometry1 = Geometry::QUAD();
+  Geometry geometry2 = Geometry::QUAD();
 
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New(geometry1, shader);
@@ -170,7 +170,7 @@ int UtcDaliRendererSetGetShader(void)
   Shader shader2 = CreateShader();
   shader2.RegisterProperty( "uFadeColor", Color::GREEN );
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New(geometry, shader1);
   Actor actor = Actor::New();
   actor.AddRenderer(renderer);
@@ -210,7 +210,7 @@ int UtcDaliRendererSetGetDepthIndex(void)
   tet_infoline("Test SetDepthIndex, GetDepthIndex");
 
   Shader shader = CreateShader();
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New(geometry, shader);
   Actor actor = Actor::New();
   actor.AddRenderer(renderer);
@@ -241,7 +241,7 @@ int UtcDaliRendererSetGetFaceCullingMode(void)
   TestApplication application;
 
   tet_infoline("Test SetFaceCullingMode(cullingMode)");
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New( geometry, shader );
 
@@ -326,7 +326,7 @@ int UtcDaliRendererBlendOptions01(void)
 
   tet_infoline("Test BLEND_FACTOR properties ");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New( geometry, shader );
 
@@ -372,7 +372,7 @@ int UtcDaliRendererBlendOptions02(void)
 
   tet_infoline("Test BLEND_FACTOR properties ");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New( geometry, shader );
 
@@ -418,7 +418,7 @@ int UtcDaliRendererBlendOptions03(void)
 
   tet_infoline("Test GetBlendEquation() defaults ");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New( geometry, shader );
 
@@ -443,7 +443,7 @@ int UtcDaliRendererBlendOptions04(void)
 
   tet_infoline("Test SetBlendEquation() ");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New( geometry, shader );
 
@@ -488,7 +488,7 @@ int UtcDaliRendererSetBlendMode01(void)
 
   tet_infoline("Test setting the blend mode to on with an opaque color renders with blending enabled");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New( geometry, shader );
 
@@ -520,7 +520,7 @@ int UtcDaliRendererSetBlendMode02(void)
 
   tet_infoline("Test setting the blend mode to off with a transparent color renders with blending disabled (and not enabled)");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New( geometry, shader );
 
@@ -552,7 +552,7 @@ int UtcDaliRendererSetBlendMode03(void)
 
   tet_infoline("Test setting the blend mode to auto with a transparent color renders with blending enabled");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New( geometry, shader );
 
@@ -584,7 +584,7 @@ int UtcDaliRendererSetBlendMode04(void)
 
   tet_infoline("Test setting the blend mode to auto with an opaque color renders with blending disabled");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New( geometry, shader );
 
@@ -615,7 +615,7 @@ int UtcDaliRendererSetBlendMode04b(void)
 
   tet_infoline("Test setting the blend mode to auto with a transparent actor color renders with blending enabled");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New( geometry, shader );
 
@@ -647,7 +647,7 @@ int UtcDaliRendererSetBlendMode04c(void)
 
   tet_infoline("Test setting the blend mode to auto with an opaque opaque actor color renders with blending disabled");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New( geometry, shader );
 
@@ -679,7 +679,7 @@ int UtcDaliRendererSetBlendMode05(void)
 
   tet_infoline("Test setting the blend mode to auto with an opaque color and an image with an alpha channel renders with blending enabled");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   BufferImage image = BufferImage::New( 40, 40, Pixel::RGBA8888 );
 
   Shader shader = CreateShader();
@@ -713,7 +713,7 @@ int UtcDaliRendererSetBlendMode06(void)
   TestApplication application;
   tet_infoline("Test setting the blend mode to auto with an opaque color and an image without an alpha channel and a shader with the hint OUTPUT_IS_TRANSPARENT renders with blending enabled");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = Shader::New( "vertexSrc", "fragmentSrc", Shader::HINT_OUTPUT_IS_TRANSPARENT );
 
   Renderer renderer = Renderer::New( geometry, shader );
@@ -744,7 +744,7 @@ int UtcDaliRendererSetBlendMode07(void)
   TestApplication application;
   tet_infoline("Test setting the blend mode to auto with an opaque color and an image without an alpha channel and a shader with the hint OUTPUT_IS_OPAQUE renders with blending disabled");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = Shader::New( "vertexSrc", "fragmentSrc" );
 
   BufferImage image = BufferImage::New( 50, 50, Pixel::RGB888 );
@@ -777,7 +777,7 @@ int UtcDaliRendererGetBlendMode(void)
 
   tet_infoline("Test GetBlendMode()");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = Shader::New( "vertexSrc", "fragmentSrc" );
   Renderer renderer = Renderer::New( geometry, shader );
 
@@ -804,7 +804,7 @@ int UtcDaliRendererSetBlendColor(void)
 
   tet_infoline("Test SetBlendColor(color)");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = Shader::New( "vertexSrc", "fragmentSrc" );
   TextureSet textureSet = TextureSet::New();
   BufferImage image = BufferImage::New( 50, 50, Pixel::RGBA8888 );
@@ -844,7 +844,7 @@ int UtcDaliRendererGetBlendColor(void)
 
   tet_infoline("Test GetBlendColor()");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = Shader::New( "vertexSrc", "fragmentSrc" );
   Renderer renderer = Renderer::New( geometry, shader );
 
@@ -870,7 +870,7 @@ int UtcDaliRendererPreMultipledAlpha(void)
 
   tet_infoline("Test BLEND_PRE_MULTIPLIED_ALPHA property");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = Shader::New( "vertexSrc", "fragmentSrc" );
   Renderer renderer = Renderer::New( geometry, shader );
 
@@ -935,7 +935,7 @@ int UtcDaliRendererConstraint01(void)
   tet_infoline("Test that a non-uniform renderer property can be constrained");
 
   Shader shader = Shader::New("VertexSource", "FragmentSource");
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
 
   Actor actor = Actor::New();
@@ -977,7 +977,7 @@ int UtcDaliRendererConstraint02(void)
   tet_infoline("Test that a uniform map renderer property can be constrained");
 
   Shader shader = Shader::New("VertexSource", "FragmentSource");
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
 
   Actor actor = Actor::New();
@@ -1033,7 +1033,7 @@ int UtcDaliRendererAnimatedProperty01(void)
   tet_infoline("Test that a non-uniform renderer property can be animated");
 
   Shader shader = Shader::New("VertexSource", "FragmentSource");
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
 
   Actor actor = Actor::New();
@@ -1074,7 +1074,7 @@ int UtcDaliRendererAnimatedProperty02(void)
   tet_infoline("Test that a uniform map renderer property can be animated");
 
   Shader shader = Shader::New("VertexSource", "FragmentSource");
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
 
   Actor actor = Actor::New();
@@ -1127,8 +1127,7 @@ int UtcDaliRendererUniformMapPrecendence01(void)
   Shader shader = Shader::New("VertexSource", "FragmentSource");
   TextureSet textureSet = CreateTextureSet( image );
 
-  PropertyBuffer vertexBuffer = CreatePropertyBuffer();
-  Geometry geometry = CreateQuadGeometryFromBuffer(vertexBuffer);
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
   renderer.SetTextures( textureSet );
 
@@ -1185,8 +1184,7 @@ int UtcDaliRendererUniformMapPrecendence02(void)
   Shader shader = Shader::New("VertexSource", "FragmentSource");
   TextureSet textureSet = CreateTextureSet( image );
 
-  PropertyBuffer vertexBuffer = CreatePropertyBuffer();
-  Geometry geometry = CreateQuadGeometryFromBuffer(vertexBuffer);
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
   renderer.SetTextures( textureSet );
 
@@ -1244,8 +1242,7 @@ int UtcDaliRendererUniformMapPrecendence03(void)
   Shader shader = Shader::New("VertexSource", "FragmentSource");
   TextureSet textureSet = CreateTextureSet( image );
 
-  PropertyBuffer vertexBuffer = CreatePropertyBuffer();
-  Geometry geometry = CreateQuadGeometryFromBuffer(vertexBuffer);
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
   renderer.SetTextures( textureSet );
 
@@ -1283,8 +1280,7 @@ int UtcDaliRendererUniformMapMultipleUniforms01(void)
   Shader shader = Shader::New("VertexSource", "FragmentSource");
   TextureSet textureSet = CreateTextureSet( image );
 
-  PropertyBuffer vertexBuffer = CreatePropertyBuffer();
-  Geometry geometry = CreateQuadGeometryFromBuffer(vertexBuffer);
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
   renderer.SetTextures( textureSet );
 
@@ -1331,8 +1327,7 @@ int UtcDaliRendererUniformMapMultipleUniforms02(void)
   Shader shader = Shader::New("VertexSource", "FragmentSource");
   TextureSet textureSet = CreateTextureSet( image );
 
-  PropertyBuffer vertexBuffer = CreatePropertyBuffer();
-  Geometry geometry = CreateQuadGeometryFromBuffer(vertexBuffer);
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
   renderer.SetTextures( textureSet );
 
@@ -1380,8 +1375,7 @@ int UtcDaliRendererRenderOrder2DLayer(void)
   tet_infoline("Test the rendering order in a 2D layer is correct");
 
   Shader shader = Shader::New("VertexSource", "FragmentSource");
-  PropertyBuffer vertexBuffer = CreatePropertyBuffer();
-  Geometry geometry = CreateQuadGeometryFromBuffer(vertexBuffer);
+  Geometry geometry = Geometry::QUAD();
 
   Actor actor0 = Actor::New();
   actor0.SetAnchorPoint(AnchorPoint::CENTER);
@@ -1512,8 +1506,7 @@ int UtcDaliRendererRenderOrder2DLayerMultipleRenderers(void)
    */
 
   Shader shader = Shader::New("VertexSource", "FragmentSource");
-  PropertyBuffer vertexBuffer = CreatePropertyBuffer();
-  Geometry geometry = CreateQuadGeometryFromBuffer(vertexBuffer);
+  Geometry geometry = Geometry::QUAD();
 
   Actor actor0 = Actor::New();
   actor0.SetAnchorPoint(AnchorPoint::CENTER);
@@ -1627,8 +1620,7 @@ int UtcDaliRendererRenderOrder2DLayerOverlay(void)
   tet_infoline("Test the rendering order in a 2D layer is correct for overlays");
 
   Shader shader = Shader::New("VertexSource", "FragmentSource");
-  PropertyBuffer vertexBuffer = CreatePropertyBuffer();
-  Geometry geometry = CreateQuadGeometryFromBuffer(vertexBuffer);
+  Geometry geometry = Geometry::QUAD();
 
   Actor actor0 = Actor::New();
   actor0.SetAnchorPoint(AnchorPoint::CENTER);
@@ -1892,7 +1884,7 @@ int UtcDaliRendererSetDepthFunction(void)
 
   tet_infoline("Test setting the depth function");
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = CreateShader();
   Renderer renderer = Renderer::New( geometry, shader );
 

diff --git a/automated-tests/src/dali-devel/utc-Dali-Sampler.cpp b/automated-tests/src/dali-devel/utc-Dali-Sampler.cpp
index 7c092f8..0c67242 100644 (file)
--- a/automated-tests/src/dali-devel/utc-Dali-Sampler.cpp
+++ b/automated-tests/src/dali-devel/utc-Dali-Sampler.cpp
@@ -126,7 +126,7 @@ int UtcSamplerSetFilterMode(void)
   textureSet.SetSampler( 0u, sampler );
 
   Shader shader = CreateShader();
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
   renderer.SetTextures( textureSet );
   Actor actor = Actor::New();
@@ -257,7 +257,7 @@ int UtcSamplerSetWrapMode(void)
   textureSet.SetSampler( 0u, sampler );
 
   Shader shader = CreateShader();
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
   renderer.SetTextures( textureSet );
 

diff --git a/automated-tests/src/dali-devel/utc-Dali-Shader.cpp b/automated-tests/src/dali-devel/utc-Dali-Shader.cpp
index 11403d2..5c2f7a4 100644 (file)
--- a/automated-tests/src/dali-devel/utc-Dali-Shader.cpp
+++ b/automated-tests/src/dali-devel/utc-Dali-Shader.cpp
@@ -123,7 +123,7 @@ int UtcDaliShaderConstraint01(void)
   tet_infoline("Test that a non-uniform shader property can be constrained");
 
   Shader shader = Shader::New(VertexSource, FragmentSource);
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
 
   Actor actor = Actor::New();
@@ -165,7 +165,7 @@ int UtcDaliShaderConstraint02(void)
   tet_infoline("Test that a uniform map shader property can be constrained");
 
   Shader shader = Shader::New(VertexSource, FragmentSource);
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
 
   Actor actor = Actor::New();
@@ -219,7 +219,7 @@ int UtcDaliShaderAnimatedProperty01(void)
   tet_infoline("Test that a non-uniform shader property can be animated");
 
   Shader shader = Shader::New(VertexSource, FragmentSource);
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
 
   Actor actor = Actor::New();
@@ -260,7 +260,7 @@ int UtcDaliShaderAnimatedProperty02(void)
   tet_infoline("Test that a uniform map shader property can be animated");
 
   Shader shader = Shader::New(VertexSource, FragmentSource);
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
 
   Actor actor = Actor::New();

diff --git a/automated-tests/src/dali-devel/utc-Dali-TextureSet.cpp b/automated-tests/src/dali-devel/utc-Dali-TextureSet.cpp
index 483b5dc..1c7be48 100644 (file)
--- a/automated-tests/src/dali-devel/utc-Dali-TextureSet.cpp
+++ b/automated-tests/src/dali-devel/utc-Dali-TextureSet.cpp
@@ -120,7 +120,7 @@ int UtcDaliTextureSetSetImage01(void)
   TextureSet textureSet = CreateTextureSet();
   textureSet.SetImage( 0u, image );
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
   renderer.SetTextures( textureSet );
 
@@ -167,7 +167,7 @@ int UtcDaliTextureSetSetImage02(void)
   textureSet.SetImage( 0u, image );
   textureSet.SetSampler( 0u, sampler );
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
   renderer.SetTextures( textureSet );
 
@@ -210,7 +210,7 @@ int UtcDaliTextureSetSetSampler(void)
   Shader shader = CreateShader();
   TextureSet textureSet = CreateTextureSet( image );
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New( geometry, shader );
   renderer.SetTextures( textureSet );
 

diff --git a/automated-tests/src/dali-internal/utc-Dali-Internal-FrustumCulling.cpp b/automated-tests/src/dali-internal/utc-Dali-Internal-FrustumCulling.cpp
index 7dfd62e..e3f440e 100644 (file)
--- a/automated-tests/src/dali-internal/utc-Dali-Internal-FrustumCulling.cpp
+++ b/automated-tests/src/dali-internal/utc-Dali-Internal-FrustumCulling.cpp
@@ -33,7 +33,6 @@ using namespace Dali;
 
 const char* VERTEX_SHADER = MAKE_SHADER(
 attribute mediump vec2    aPosition;
-attribute mediump vec2    aTexCoord;
 uniform   mediump mat4    uMvpMatrix;
 uniform   mediump vec3    uSize;
 varying   mediump vec2    vTexCoord;
@@ -43,7 +42,7 @@ void main()
   mediump vec4 vertexPosition = vec4(aPosition, 0.0, 1.0);
   vertexPosition.xyz *= uSize;
   vertexPosition = uMvpMatrix * vertexPosition;
-  vTexCoord = aTexCoord;
+  vTexCoord = aPosition + vec2(0.5);
   gl_Position = vertexPosition;
 }
 );
@@ -57,39 +56,12 @@ void main()
 }
 );
 
-Geometry CreateGeometry()
-{
-  const float halfQuadSize = .5f;
-  struct TexturedQuadVertex { Vector2 position; Vector2 textureCoordinates; };
-  TexturedQuadVertex texturedQuadVertexData[4] = {
-    { Vector2(-halfQuadSize, -halfQuadSize), Vector2(0.f, 0.f) },
-    { Vector2( halfQuadSize, -halfQuadSize), Vector2(1.f, 0.f) },
-    { Vector2(-halfQuadSize,  halfQuadSize), Vector2(0.f, 1.f) },
-    { Vector2( halfQuadSize,  halfQuadSize), Vector2(1.f, 1.f) } };
-
-  Property::Map texturedQuadVertexFormat;
-  texturedQuadVertexFormat["aPosition"] = Property::VECTOR2;
-  texturedQuadVertexFormat["aTexCoord"] = Property::VECTOR2;
-  PropertyBuffer texturedQuadVertices = PropertyBuffer::New( texturedQuadVertexFormat );
-  texturedQuadVertices.SetData( texturedQuadVertexData, 4 );
-
-  // Create indices
-  unsigned short indexData[6] = { 0, 3, 1, 0, 2, 3 };
-
-  // Create the geometry object
-  Geometry texturedQuadGeometry = Geometry::New();
-  texturedQuadGeometry.AddVertexBuffer( texturedQuadVertices );
-  texturedQuadGeometry.SetIndexBuffer( indexData, sizeof(indexData)/sizeof(indexData[0]) );
-
-  return texturedQuadGeometry;
-}
-
 Actor CreateMeshActorToStage( TestApplication& application, Vector3 parentOrigin = ParentOrigin::CENTER, Vector3 anchorPoint = AnchorPoint::CENTER, Shader::ShaderHints shaderHints = Shader::HINT_NONE )
 {
   PixelBuffer* pixelBuffer = new PixelBuffer[ 4 ];
   BufferImage image = BufferImage::New( pixelBuffer, 1, 1 );
 
-  Geometry geometry = CreateGeometry();
+  Geometry geometry = Geometry::QUAD();
   Shader shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER, shaderHints );
   TextureSet textureSet = TextureSet::New();
   textureSet.SetImage( 0u, image );
@@ -148,7 +120,7 @@ int UtcFrustumCullN(void)
   application.SendNotification();
   application.Render( 16 );
 
-  DALI_TEST_CHECK( drawTrace.FindMethod( "DrawElements" ) );
+  DALI_TEST_CHECK( drawTrace.FindMethod( "DrawArrays" ) );
 
   END_TEST;
 }
@@ -173,7 +145,7 @@ int UtcFrustumLeftCullP(void)
   application.Render( 16 );
 
   // This will be sphere culled
-  DALI_TEST_CHECK( !drawTrace.FindMethod( "DrawElements" ) );
+  DALI_TEST_CHECK( !drawTrace.FindMethod( "DrawArrays" ) );
 
   END_TEST;
 }
@@ -192,7 +164,7 @@ int UtcFrustumLeftCullN(void)
   application.SendNotification();
   application.Render( 16 );
 
-  DALI_TEST_CHECK( drawTrace.FindMethod( "DrawElements" ) );
+  DALI_TEST_CHECK( drawTrace.FindMethod( "DrawArrays" ) );
 
   END_TEST;
 }
@@ -218,7 +190,7 @@ int UtcFrustumRightCullP(void)
   application.Render( 16 );
 
   // This will be sphere culled
-  DALI_TEST_CHECK( !drawTrace.FindMethod( "DrawElements" ) );
+  DALI_TEST_CHECK( !drawTrace.FindMethod( "DrawArrays" ) );
 
   END_TEST;
 }
@@ -237,7 +209,7 @@ int UtcFrustumRightCullN(void)
   application.SendNotification();
   application.Render( 16 );
 
-  DALI_TEST_CHECK( drawTrace.FindMethod( "DrawElements" ) );
+  DALI_TEST_CHECK( drawTrace.FindMethod( "DrawArrays" ) );
 
   END_TEST;
 }
@@ -263,7 +235,7 @@ int UtcFrustumTopCullP(void)
   application.Render( 16 );
 
   // This will be sphere culled
-  DALI_TEST_CHECK( !drawTrace.FindMethod( "DrawElements" ) );
+  DALI_TEST_CHECK( !drawTrace.FindMethod( "DrawArrays" ) );
 
   END_TEST;
 }
@@ -283,7 +255,7 @@ int UtcFrustumTopCullN(void)
   application.Render( 16 );
 
   // This will be box culled
-  DALI_TEST_CHECK( drawTrace.FindMethod( "DrawElements" ) );
+  DALI_TEST_CHECK( drawTrace.FindMethod( "DrawArrays" ) );
 
   END_TEST;
 }
@@ -309,7 +281,7 @@ int UtcFrustumBottomCullP(void)
   application.Render( 16 );
 
   // This will be sphere culled
-  DALI_TEST_CHECK( !drawTrace.FindMethod( "DrawElements" ) );
+  DALI_TEST_CHECK( !drawTrace.FindMethod( "DrawArrays" ) );
 
   END_TEST;
 }
@@ -328,7 +300,7 @@ int UtcFrustumBottomCullN(void)
   application.SendNotification();
   application.Render( 16 );
 
-  DALI_TEST_CHECK( drawTrace.FindMethod( "DrawElements" ) );
+  DALI_TEST_CHECK( drawTrace.FindMethod( "DrawArrays" ) );
 
   END_TEST;
 }
@@ -356,7 +328,7 @@ int UtcFrustumNearCullP(void)
   application.Render( 16 );
 
   // This will be sphere culled
-  DALI_TEST_CHECK( !drawTrace.FindMethod( "DrawElements" ) );
+  DALI_TEST_CHECK( !drawTrace.FindMethod( "DrawArrays" ) );
 
   END_TEST;
 }
@@ -382,7 +354,7 @@ int UtcFrustumNearCullN(void)
   application.SendNotification();
   application.Render( 16 );
 
-  DALI_TEST_CHECK( drawTrace.FindMethod( "DrawElements" ) );
+  DALI_TEST_CHECK( drawTrace.FindMethod( "DrawArrays" ) );
 
   END_TEST;
 }
@@ -410,7 +382,7 @@ int UtcFrustumFarCullP(void)
   application.Render( 16 );
 
   // This will be sphere culled
-  DALI_TEST_CHECK( !drawTrace.FindMethod( "DrawElements" ) );
+  DALI_TEST_CHECK( !drawTrace.FindMethod( "DrawArrays" ) );
 
   END_TEST;
 }
@@ -436,7 +408,7 @@ int UtcFrustumFarCullN(void)
   application.SendNotification();
   application.Render( 16 );
 
-  DALI_TEST_CHECK( drawTrace.FindMethod( "DrawElements" ) );
+  DALI_TEST_CHECK( drawTrace.FindMethod( "DrawArrays" ) );
 
   END_TEST;
 }
@@ -455,7 +427,7 @@ int UtcFrustumCullDisabledP(void)
   application.Render( 16 );
 
   // This should not be culled
-  DALI_TEST_CHECK( drawTrace.FindMethod( "DrawElements" ) );
+  DALI_TEST_CHECK( drawTrace.FindMethod( "DrawArrays" ) );
 
   END_TEST;
 }

diff --git a/automated-tests/src/dali/dali-test-suite-utils/mesh-builder.cpp b/automated-tests/src/dali/dali-test-suite-utils/mesh-builder.cpp
index 5b127c7..978dc74 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/mesh-builder.cpp
+++ b/automated-tests/src/dali/dali-test-suite-utils/mesh-builder.cpp
@@ -45,32 +45,4 @@ PropertyBuffer CreatePropertyBuffer()
   return vertexData;
 }
 
-Geometry CreateQuadGeometry(void)
-{
-  PropertyBuffer vertexData = CreatePropertyBuffer();
-  return CreateQuadGeometryFromBuffer( vertexData );
-}
-
-Geometry CreateQuadGeometryFromBuffer( PropertyBuffer vertexData )
-{
-  const float halfQuadSize = .5f;
-  struct TexturedQuadVertex { Vector2 position; Vector2 textureCoordinates; };
-  TexturedQuadVertex texturedQuadVertexData[4] = {
-    { Vector2(-halfQuadSize, -halfQuadSize), Vector2(0.f, 0.f) },
-    { Vector2( halfQuadSize, -halfQuadSize), Vector2(1.f, 0.f) },
-    { Vector2(-halfQuadSize,  halfQuadSize), Vector2(0.f, 1.f) },
-    { Vector2( halfQuadSize,  halfQuadSize), Vector2(1.f, 1.f) } };
-  vertexData.SetData(texturedQuadVertexData, 4);
-
-  unsigned short indexData[6] = { 0, 3, 1, 0, 2, 3 };
-
-  Geometry geometry = Geometry::New();
-  geometry.AddVertexBuffer( vertexData );
-  geometry.SetIndexBuffer( indexData, sizeof(indexData)/sizeof(indexData[0]) );
-
-  return geometry;
-}
-
-
-
 } // namespace Dali

diff --git a/automated-tests/src/dali/dali-test-suite-utils/mesh-builder.h b/automated-tests/src/dali/dali-test-suite-utils/mesh-builder.h
index bf5f6a6..e157338 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/mesh-builder.h
+++ b/automated-tests/src/dali/dali-test-suite-utils/mesh-builder.h
@@ -30,10 +30,7 @@ namespace Dali
 Shader CreateShader();
 TextureSet CreateTextureSet();
 TextureSet CreateTextureSet( Image image );
-Geometry CreateQuadGeometry();
-Geometry CreateQuadGeometryFromBuffer( PropertyBuffer vertexData );
 PropertyBuffer CreatePropertyBuffer();
-
 }
 
 #endif // MESH_BUILDER_H

diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-actor-utils.cpp b/automated-tests/src/dali/dali-test-suite-utils/test-actor-utils.cpp
index 2f833c6..9be97bc 100644 (file)
--- a/automated-tests/src/dali/dali-test-suite-utils/test-actor-utils.cpp
+++ b/automated-tests/src/dali/dali-test-suite-utils/test-actor-utils.cpp
@@ -28,8 +28,6 @@ namespace Dali
 
 namespace
 {
-const char * const TEXTURE_UNIFORM_NAME( "sTexture" );
-
 const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
   attribute mediump vec2 aPosition;\n
   uniform mediump mat4 uMvpMatrix;\n
@@ -67,7 +65,7 @@ Actor CreateRenderableActor( Image texture )
 Actor CreateRenderableActor( Image texture, const std::string& vertexShader, const std::string& fragmentShader )
 {
   // Create the geometry
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
 
   // Create Shader
   Shader shader = Shader::New( vertexShader, fragmentShader );

diff --git a/automated-tests/src/dali/utc-Dali-RenderTask.cpp b/automated-tests/src/dali/utc-Dali-RenderTask.cpp
index 71fbcbc..4c46196 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-RenderTask.cpp
+++ b/automated-tests/src/dali/utc-Dali-RenderTask.cpp
@@ -862,7 +862,7 @@ int UtcDaliRenderTaskSetExclusive02(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( drawTrace.CountMethod("DrawElements"), 1, TEST_LOCATION );
+  DALI_TEST_EQUALS( drawTrace.CountMethod("DrawArrays"), 1, TEST_LOCATION );
 
   // Set task to non-exclusive - actor1 should render twice:
   drawTrace.Reset();
@@ -870,7 +870,7 @@ int UtcDaliRenderTaskSetExclusive02(void)
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( drawTrace.CountMethod("DrawElements"), 2, TEST_LOCATION );
+  DALI_TEST_EQUALS( drawTrace.CountMethod("DrawArrays"), 2, TEST_LOCATION );
 
   END_TEST;
 }
@@ -2000,7 +2000,7 @@ int UtcDaliRenderTaskContinous05(void)
   Integration::ResourceTypeId imageType  = imageRequest->GetType()->id;
   TextureSet textureSet = CreateTextureSet( image );
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New(geometry, shader);
   renderer.SetTextures( textureSet );
   Actor secondRootActor = Actor::New();
@@ -2106,7 +2106,7 @@ int UtcDaliRenderTaskOnce02(void)
   Integration::ResourceTypeId imageType  = imageRequest->GetType()->id;
   TextureSet textureSet = CreateTextureSet( image );
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New(geometry, shader);
   renderer.SetTextures( textureSet );
   Actor secondRootActor = Actor::New();
@@ -2224,7 +2224,7 @@ int UtcDaliRenderTaskOnce04(void)
   Integration::ResourceTypeId imageType  = imageRequest->GetType()->id;
   TextureSet textureSet = CreateTextureSet( image );
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New(geometry, shader);
   renderer.SetTextures( textureSet );
   Actor secondRootActor = Actor::New();
@@ -2740,7 +2740,7 @@ int UtcDaliRenderTaskOnceNoSync02(void)
   Integration::ResourceTypeId imageType  = imageRequest->GetType()->id;
   TextureSet textureSet = CreateTextureSet( image );
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New(geometry, shader);
   renderer.SetTextures( textureSet );
   Actor secondRootActor = Actor::New();
@@ -2840,7 +2840,7 @@ int UtcDaliRenderTaskOnceNoSync04(void)
   Integration::ResourceTypeId imageType  = imageRequest->GetType()->id;
   TextureSet textureSet = CreateTextureSet( image );
 
-  Geometry geometry = CreateQuadGeometry();
+  Geometry geometry = Geometry::QUAD();
   Renderer renderer = Renderer::New(geometry, shader);
   renderer.SetTextures( textureSet );
   Actor secondRootActor = Actor::New();