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
/
controls
/
renderers
/
border
/
border-renderer.cpp
diff --git
a/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
b/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
index
6432ae0
..
9ae46a1
100644
(file)
--- a/
dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
+++ b/
dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
@@
-174,8
+174,10
@@
void BorderRenderer::InitializeRenderer()
mFactoryCache.SaveGeometry( RendererFactoryCache::BORDER_GEOMETRY, geometry );
}
mFactoryCache.SaveGeometry( RendererFactoryCache::BORDER_GEOMETRY, geometry );
}
- Material material = Material::New( GetBorderShader() );
- mImpl->mRenderer = Renderer::New( geometry, material );
+
+ Shader shader = GetBorderShader();
+ mImpl->mRenderer = Renderer::New( geometry, shader );
+
}
void BorderRenderer::SetBorderColor(const Vector4& color)
}
void BorderRenderer::SetBorderColor(const Vector4& color)
@@
-209,9
+211,8
@@
void BorderRenderer::RequireAntiAliasing( bool antiAliasing )
mAntiAliasing = antiAliasing;
if( mImpl->mRenderer )
{
mAntiAliasing = antiAliasing;
if( mImpl->mRenderer )
{
- Material material = mImpl->mRenderer.GetMaterial();
- Shader shader = GetBorderShader();
- material.SetShader( shader );
+ Shader borderShader( GetBorderShader() );
+ mImpl->mRenderer.SetShader( borderShader );
if( mAntiAliasing )
{
mImpl->mRenderer.SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::ON );
if( mAntiAliasing )
{
mImpl->mRenderer.SetProperty( Renderer::Property::BLENDING_MODE, BlendingMode::ON );