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
[Tizen] Fix to avoid empty texture rendering issue
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
texture-manager-impl.cpp
diff --git
a/dali-toolkit/internal/visuals/texture-manager-impl.cpp
b/dali-toolkit/internal/visuals/texture-manager-impl.cpp
index
c617a51
..
a1e9d8c
100644
(file)
--- a/
dali-toolkit/internal/visuals/texture-manager-impl.cpp
+++ b/
dali-toolkit/internal/visuals/texture-manager-impl.cpp
@@
-242,7
+242,21
@@
TextureSet TextureManager::LoadTexture(
}
TextureManager::LoadState loadState = GetTextureStateInternal( textureId );
}
TextureManager::LoadState loadState = GetTextureStateInternal( textureId );
- loadingStatus = ( loadState == TextureManager::LOADING );
+ switch (loadState)
+ {
+ case TextureManager::NOT_STARTED :
+ case TextureManager::LOADING :
+ case TextureManager::LOAD_FAILED :
+ {
+ loadingStatus = true;
+ break;
+ }
+ default :
+ {
+ loadingStatus = false;
+ break;
+ }
+ }
if( loadState == TextureManager::UPLOADED )
{
if( loadState == TextureManager::UPLOADED )
{
@@
-932,8
+946,21
@@
TextureManager::TextureHash TextureManager::GenerateHash(
{
// We are not including sizing information, but we still need an extra byte for atlasing.
hashTarget.resize( urlLength + 1u );
{
// We are not including sizing information, but we still need an extra byte for atlasing.
hashTarget.resize( urlLength + 1u );
+
// Add the atlasing to the hash input.
// Add the atlasing to the hash input.
- hashTarget[ urlLength ] = useAtlas;
+ switch( useAtlas )
+ {
+ case UseAtlas::NO_ATLAS:
+ {
+ hashTarget[ urlLength ] = 'f';
+ break;
+ }
+ case UseAtlas::USE_ATLAS:
+ {
+ hashTarget[ urlLength ] = 't';
+ break;
+ }
+ }
}
if( maskTextureId != INVALID_TEXTURE_ID )
}
if( maskTextureId != INVALID_TEXTURE_ID )