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
Merge "Remove mask internally in texture manager" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
animated-image
/
rolling-animated-image-cache.cpp
diff --git
a/dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.cpp
b/dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.cpp
index
b8a6961
..
bd6c5a7
100644
(file)
--- a/
dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.cpp
+++ b/
dali-toolkit/internal/visuals/animated-image/rolling-animated-image-cache.cpp
@@
-208,11
+208,15
@@
TextureSet RollingAnimatedImageCache::RequestFrameLoading(uint32_t frameIndex, b
loadTextureId,
mMaskingData,
SamplingMode::BOX_THEN_LINEAR,
loadTextureId,
mMaskingData,
SamplingMode::BOX_THEN_LINEAR,
- mWrapModeU,
- mWrapModeV,
synchronousLoading,
this,
preMultiplyOnLoading);
synchronousLoading,
this,
preMultiplyOnLoading);
+ if(textureSet)
+ {
+ Sampler sampler = Sampler::New();
+ sampler.SetWrapMode(mWrapModeU, mWrapModeV);
+ textureSet.SetSampler(0u, sampler);
+ }
mTextureIds[frameIndex] = loadTextureId;
mTextureIds[frameIndex] = loadTextureId;
@@
-260,7
+264,14
@@
TextureSet RollingAnimatedImageCache::GetFrontTextureSet() const
DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "RollingAnimatedImageCache::GetFrontTextureSet() FrameNumber:%d\n", mQueue[0].mFrameNumber);
TextureManager::TextureId textureId = GetCachedTextureId(0);
DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "RollingAnimatedImageCache::GetFrontTextureSet() FrameNumber:%d\n", mQueue[0].mFrameNumber);
TextureManager::TextureId textureId = GetCachedTextureId(0);
- return mTextureManager.GetTextureSet(textureId);
+ TextureSet textureSet = mTextureManager.GetTextureSet(textureId);
+ if(textureSet)
+ {
+ Sampler sampler = Sampler::New();
+ sampler.SetWrapMode(mWrapModeU, mWrapModeV);
+ textureSet.SetSampler(0u, sampler);
+ }
+ return textureSet;
}
TextureManager::TextureId RollingAnimatedImageCache::GetCachedTextureId(int index) const
}
TextureManager::TextureId RollingAnimatedImageCache::GetCachedTextureId(int index) const
@@
-276,7
+287,6
@@
void RollingAnimatedImageCache::PopFrontCache()
if(mMaskingData && mMaskingData->mAlphaMaskId != TextureManager::INVALID_TEXTURE_ID)
{
if(mMaskingData && mMaskingData->mAlphaMaskId != TextureManager::INVALID_TEXTURE_ID)
{
- mTextureManager.Remove(mMaskingData->mAlphaMaskId, this);
if(mQueue.IsEmpty())
{
mMaskingData->mAlphaMaskId = TextureManager::INVALID_TEXTURE_ID;
if(mQueue.IsEmpty())
{
mMaskingData->mAlphaMaskId = TextureManager::INVALID_TEXTURE_ID;
@@
-332,15
+342,14
@@
void RollingAnimatedImageCache::LoadComplete(bool loadSuccess, TextureInformatio
DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "AnimatedImageVisual::LoadComplete(textureId:%d) start\n", textureInformation.textureId);
LOG_CACHE;
DALI_LOG_INFO(gAnimImgLogFilter, Debug::Concise, "AnimatedImageVisual::LoadComplete(textureId:%d) start\n", textureInformation.textureId);
LOG_CACHE;
- TextureSet textureSet = mTextureManager.GetTextureSet(textureInformation.textureId);
- if(textureSet)
+ if(textureInformation.textureSet)
{
Sampler sampler = Sampler::New();
sampler.SetWrapMode(mWrapModeU, mWrapModeV);
{
Sampler sampler = Sampler::New();
sampler.SetWrapMode(mWrapModeU, mWrapModeV);
- textureSet.SetSampler(0u, sampler);
+ texture
Information.texture
Set.SetSampler(0u, sampler);
}
}
- MakeFrameReady(loadSuccess, textureSet, textureInformation.interval);
+ MakeFrameReady(loadSuccess, texture
Information.texture
Set, textureInformation.interval);
if(loadSuccess)
{
if(loadSuccess)
{