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.cpp
diff --git
a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
index
5a46ef5
..
abcd391
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.cpp
@@
-106,9
+106,14
@@
Pixel::Format AtlasGlyphManager::GetPixelFormat( uint32_t atlasId )
return GetImplementation(*this).GetPixelFormat( atlasId );
}
return GetImplementation(*this).GetPixelFormat( atlasId );
}
-
Material AtlasGlyphManager::GetMaterial
( uint32_t atlasId ) const
+
TextureSet AtlasGlyphManager::GetTextures
( uint32_t atlasId ) const
{
{
- return GetImplementation(*this).GetMaterial( atlasId );
+ return GetImplementation(*this).GetTextures( atlasId );
+}
+
+Shader AtlasGlyphManager::GetShader( uint32_t atlasId ) const
+{
+ return GetImplementation(*this).GetShader( atlasId );
}
const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics()
}
const Toolkit::AtlasGlyphManager::Metrics& AtlasGlyphManager::GetMetrics()