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
[dali_1.2.26] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
atlas-glyph-manager.h
diff --git
a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
index
1870bd5
..
3ba54de
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager.h
@@
-84,7
+84,7
@@
public:
* @param[out] slot information returned by atlas manager for addition
*/
void Add( const Text::GlyphInfo& glyph,
* @param[out] slot information returned by atlas manager for addition
*/
void Add( const Text::GlyphInfo& glyph,
- const
BufferImage
& bitmap,
+ const
PixelData
& bitmap,
AtlasManager::AtlasSlot& slot );
/**
AtlasManager::AtlasSlot& slot );
/**
@@
-140,13
+140,22
@@
public:
Pixel::Format GetPixelFormat( uint32_t atlasId );
/**
Pixel::Format GetPixelFormat( uint32_t atlasId );
/**
- * @brief Get the
material
used by an atlas
+ * @brief Get the
texture set
used by an atlas
*
* @param[in] atlasId Id of an atlas
*
*
* @param[in] atlasId Id of an atlas
*
- * @return The
material
used by the atlas
+ * @return The
texture set
used by the atlas
*/
*/
- Material GetMaterial( uint32_t atlasId ) const;
+ TextureSet GetTextures( uint32_t atlasId ) const;
+
+ /**
+ * @brief Get the shader used by an atlas
+ *
+ * @param[in] atlasId Id of an atlas
+ *
+ * @return The shader used by the atlas
+ */
+ Shader GetShader( uint32_t atlasId ) const;
/**
* @brief Get Glyph Manager metrics
/**
* @brief Get Glyph Manager metrics