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
Merge "Revert "Remove dali-core dependency of GLES version."" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
text
/
rendering-backend.h
diff --git
a/dali-toolkit/public-api/text/rendering-backend.h
b/dali-toolkit/public-api/text/rendering-backend.h
old mode 100644
(file)
new mode 100755
(executable)
index
5640a83
..
00686ed
--- a/
dali-toolkit/public-api/text/rendering-backend.h
+++ b/
dali-toolkit/public-api/text/rendering-backend.h
@@
-27,10
+27,14
@@
namespace Toolkit
namespace Text
{
namespace Text
{
-// The type of text renderer required
+/**
+ * @brief Enumeration for the type of text renderer required.
+ * @SINCE_1_0.0
+ */
enum RenderingType
{
enum RenderingType
{
- RENDERING_SHARED_ATLAS ///< A bitmap-based solution where renderers can share a texture atlas @SINCE_1_0.0
+ RENDERING_SHARED_ATLAS, ///< A bitmap-based solution where renderers can share a texture atlas @SINCE_1_0.0
+ RENDERING_VECTOR_BASED ///< A solution where glyphs are stored as vectors (scalable). Requires highp shader support. @SINCE_1_1.31
};
const unsigned int DEFAULT_RENDERING_BACKEND = RENDERING_SHARED_ATLAS;
};
const unsigned int DEFAULT_RENDERING_BACKEND = RENDERING_SHARED_ATLAS;