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 "Visual bases checks if visual already staged before adding to stage" into...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
image
/
image-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/image/image-visual.cpp
b/dali-toolkit/internal/visuals/image/image-visual.cpp
index
d4d7e19
..
084491a
100644
(file)
--- a/
dali-toolkit/internal/visuals/image/image-visual.cpp
+++ b/
dali-toolkit/internal/visuals/image/image-visual.cpp
@@
-522,7
+522,7
@@
TextureSet ImageVisual::CreateTextureSet( Vector4& textureRect, const std::strin
void ImageVisual::InitializeRenderer( const std::string& imageUrl )
{
void ImageVisual::InitializeRenderer( const std::string& imageUrl )
{
-
mImpl->mRenderer.Reset(
);
+
DALI_ASSERT_DEBUG( !mImpl->mRenderer && "Renderer should have been removed from stage and already reset before initialization"
);
mImageUrl = imageUrl;
mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED;
mImageUrl = imageUrl;
mImpl->mFlags &= ~Impl::IS_ATLASING_APPLIED;
@@
-586,8
+586,9
@@
void ImageVisual::InitializeRenderer( const std::string& imageUrl )
void ImageVisual::InitializeRenderer( const Image& image )
{
void ImageVisual::InitializeRenderer( const Image& image )
{
+ DALI_ASSERT_DEBUG( !mImpl->mRenderer && "Renderer should have been removed from stage and already reset before initialization" );
+
mImpl->mFlags &= ~Impl::IS_FROM_CACHE;
mImpl->mFlags &= ~Impl::IS_FROM_CACHE;
- mImpl->mRenderer.Reset();
// don't reuse CreateTextureSet
TextureSet textures = TextureSet::New();
// don't reuse CreateTextureSet
TextureSet textures = TextureSet::New();
@@
-728,6
+729,7
@@
Shader ImageVisual::GetImageShader( VisualFactoryCache& factoryCache, bool atlas
if( !shader )
{
shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER_ATLAS_CLAMP );
if( !shader )
{
shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER_ATLAS_CLAMP );
+ shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT );
factoryCache.SaveShader( VisualFactoryCache::IMAGE_SHADER_ATLAS_DEFAULT_WRAP, shader );
}
}
factoryCache.SaveShader( VisualFactoryCache::IMAGE_SHADER_ATLAS_DEFAULT_WRAP, shader );
}
}
@@
-737,6
+739,7
@@
Shader ImageVisual::GetImageShader( VisualFactoryCache& factoryCache, bool atlas
if( !shader )
{
shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER_ATLAS_VARIOUS_WRAP );
if( !shader )
{
shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER_ATLAS_VARIOUS_WRAP );
+ shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT );
factoryCache.SaveShader( VisualFactoryCache::IMAGE_SHADER_ATLAS_CUSTOM_WRAP, shader );
}
}
factoryCache.SaveShader( VisualFactoryCache::IMAGE_SHADER_ATLAS_CUSTOM_WRAP, shader );
}
}
@@
-747,10
+750,11
@@
Shader ImageVisual::GetImageShader( VisualFactoryCache& factoryCache, bool atlas
if( !shader )
{
shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER_NO_ATLAS );
if( !shader )
{
shader = Shader::New( VERTEX_SHADER, FRAGMENT_SHADER_NO_ATLAS );
+ shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT );
factoryCache.SaveShader( VisualFactoryCache::IMAGE_SHADER, shader );
}
}
factoryCache.SaveShader( VisualFactoryCache::IMAGE_SHADER, shader );
}
}
- shader.RegisterProperty( PIXEL_AREA_UNIFORM_NAME, FULL_TEXTURE_RECT );
+
return shader;
}
return shader;
}