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
Rendering API clean-up
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
atlas-glyph-manager-impl.h
diff --git
a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
index
0c67501
..
90210f2
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h
@@
-108,9
+108,14
@@
public:
void AdjustReferenceCount( Text::FontId fontId, Text::GlyphIndex index, int32_t delta );
/**
void AdjustReferenceCount( Text::FontId fontId, Text::GlyphIndex index, int32_t delta );
/**
- * @copydoc Toolkit::AtlasGlyphManager::Get
Material
+ * @copydoc Toolkit::AtlasGlyphManager::Get
Textures
*/
*/
- Material GetMaterial( uint32_t atlasId ) const;
+ TextureSet GetTextures( uint32_t atlasId ) const;
+
+ /**
+ * @copydoc Toolkit::AtlasGlyphManager::GetShader
+ */
+ Shader GetShader( uint32_t atlasId ) const;
/**
* @copydoc Toolkit::AtlasGlyphManager::GetMetrics
/**
* @copydoc Toolkit::AtlasGlyphManager::GetMetrics