projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
(Vector) Refactor vector to use thread pool
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
mesh-builder.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.h
index
bf5f6a6
..
d22f9c8
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/mesh-builder.h
@@
-1,7
+1,8
@@
#ifndef MESH_BUILDER_H
#define MESH_BUILDER_H
#ifndef MESH_BUILDER_H
#define MESH_BUILDER_H
+
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-17,12
+18,8
@@
*
*/
*
*/
+// EXTERNAL INCLUDES
#include <dali/public-api/dali-core.h>
#include <dali/public-api/dali-core.h>
-#include <dali/devel-api/object/property-buffer.h>
-#include <dali/devel-api/rendering/geometry.h>
-#include <dali/devel-api/rendering/texture-set.h>
-#include <dali/devel-api/rendering/sampler.h>
-#include <dali/devel-api/rendering/renderer.h>
namespace Dali
{
namespace Dali
{
@@
-31,7
+28,6
@@
Shader CreateShader();
TextureSet CreateTextureSet();
TextureSet CreateTextureSet( Image image );
Geometry CreateQuadGeometry();
TextureSet CreateTextureSet();
TextureSet CreateTextureSet( Image image );
Geometry CreateQuadGeometry();
-Geometry CreateQuadGeometryFromBuffer( PropertyBuffer vertexData );
PropertyBuffer CreatePropertyBuffer();
}
PropertyBuffer CreatePropertyBuffer();
}