X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Frendering%2Fatlas%2Fatlas-glyph-manager-impl.h;h=b72b6490d8328508253a40c1183458b2118e79f6;hb=c57e053b5795783ad92b0fd7f8fbaba6b6d9322a;hp=0c675014fde43c59c7048d0c042ba8ae2ac75895;hpb=aae67693a392087235a203195366691f2dc9f91f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git 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..b72b649 100644 --- a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h +++ b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.h @@ -70,7 +70,7 @@ public: * @copydoc Toolkit::AtlasGlyphManager::Add */ void Add( const Text::GlyphInfo& glyph, - const BufferImage& bitmap, + const PixelData& bitmap, Dali::Toolkit::AtlasManager::AtlasSlot& slot ); /** @@ -108,9 +108,14 @@ public: void AdjustReferenceCount( Text::FontId fontId, Text::GlyphIndex index, int32_t delta ); /** - * @copydoc Toolkit::AtlasGlyphManager::GetMaterial + * @copydoc Toolkit::AtlasGlyphManager::GetTextures */ - 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