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-manager-impl.cpp
diff --git
a/dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.cpp
b/dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.cpp
index
dacb141
..
8d3ae1b
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.cpp
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-manager-impl.cpp
@@
-436,7
+436,7
@@
AtlasManager::SizeType AtlasManager::GetAtlasCount() const
return mAtlasList.size();
}
return mAtlasList.size();
}
-Pixel::Format AtlasManager::GetPixelFormat( AtlasId atlas )
+Pixel::Format AtlasManager::GetPixelFormat( AtlasId atlas )
const
{
DALI_ASSERT_DEBUG( atlas && atlas <= mAtlasList.size() );
Pixel::Format pixelFormat = Pixel::RGBA8888;
{
DALI_ASSERT_DEBUG( atlas && atlas <= mAtlasList.size() );
Pixel::Format pixelFormat = Pixel::RGBA8888;
@@
-476,23
+476,23
@@
void AtlasManager::GetMetrics( Toolkit::AtlasManager::Metrics& metrics )
metrics.mTextureMemoryUsed = textureMemoryUsed;
}
metrics.mTextureMemoryUsed = textureMemoryUsed;
}
-
Material AtlasManager::GetMaterial
( AtlasId atlas ) const
+
TextureSet AtlasManager::GetTextures
( AtlasId atlas ) const
{
DALI_ASSERT_DEBUG( atlas && atlas <= mAtlasList.size() );
{
DALI_ASSERT_DEBUG( atlas && atlas <= mAtlasList.size() );
-
Material material
;
+
TextureSet textureSet
;
if ( atlas && atlas-- <= mAtlasList.size() )
{
if ( atlas && atlas-- <= mAtlasList.size() )
{
-
material = mAtlasList[ atlas ].mMaterial
;
+
textureSet = mAtlasList[ atlas ].mTextureSet
;
}
}
- return
material
;
+ return
textureSet
;
}
}
-void AtlasManager::Set
Material( AtlasId atlas, Material& material
)
+void AtlasManager::Set
Textures( AtlasId atlas, TextureSet& textureSet
)
{
DALI_ASSERT_DEBUG( atlas && atlas <= mAtlasList.size() );
if ( atlas && atlas-- <= mAtlasList.size() )
{
{
DALI_ASSERT_DEBUG( atlas && atlas <= mAtlasList.size() );
if ( atlas && atlas-- <= mAtlasList.size() )
{
- mAtlasList[ atlas ].m
Material = material
;
+ mAtlasList[ atlas ].m
TextureSet = textureSet
;
}
}
}
}