From bf2d577a8f0200efa880e568c32a1e6a884ccb70 Mon Sep 17 00:00:00 2001 From: David Steele Date: Tue, 25 Aug 2020 15:07:47 +0100 Subject: [PATCH] Updated test files in line with dali-core Change-Id: I6c147d768225205879f3a9793ff6361d69421899 --- .../src/dali-adaptor/dali-test-suite-utils/mesh-builder.cpp | 6 +++--- .../src/dali-adaptor/dali-test-suite-utils/mesh-builder.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.cpp index 2e8f724..3d7c359 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.cpp +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.cpp @@ -38,19 +38,19 @@ TextureSet CreateTextureSet( Texture texture ) return textureSet; } -PropertyBuffer CreatePropertyBuffer() +VertexBuffer CreateVertexBuffer() { Property::Map texturedQuadVertexFormat; texturedQuadVertexFormat["aPosition"] = Property::VECTOR2; texturedQuadVertexFormat["aVertexCoord"] = Property::VECTOR2; - PropertyBuffer vertexData = PropertyBuffer::New( texturedQuadVertexFormat ); + VertexBuffer vertexData = VertexBuffer::New( texturedQuadVertexFormat ); return vertexData; } Geometry CreateQuadGeometry(void) { - PropertyBuffer vertexData = CreatePropertyBuffer(); + VertexBuffer vertexData = CreateVertexBuffer(); const float halfQuadSize = .5f; struct TexturedQuadVertex { Vector2 position; Vector2 textureCoordinates; }; TexturedQuadVertex texturedQuadVertexData[4] = { diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.h index 37d13ec..e593d38 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.h +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/mesh-builder.h @@ -28,7 +28,7 @@ Shader CreateShader(); TextureSet CreateTextureSet(); TextureSet CreateTextureSet( Texture texture ); Geometry CreateQuadGeometry(); -PropertyBuffer CreatePropertyBuffer(); +VertexBuffer CreateVertexBuffer(); } -- 2.7.4