Merge "Add new layouting support for TextLabel and ImageView." 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 522a307..00686ed
--- a/dali-toolkit/public-api/text/rendering-backend.h
+++ b/dali-toolkit/public-api/text/rendering-backend.h
@@ -27,11 +27,14 @@ namespace Toolkit
 namespace Text
 {
 
-// The type of text renderer required
+/**
+ * @brief Enumeration for the type of text renderer required.
+ * @SINCE_1_0.0
+ */
 enum RenderingType
 {
-  RENDERING_BASIC,       ///< A bitmap-based reference implementation
-  RENDERING_SHARED_ATLAS ///< A bitmap-based solution where renderers can share a texture atlas
+  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;