X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Fborder%2Fborder-renderer.cpp;h=9ae46a162d829ac522e7e4a4cb4050aeefc625a7;hp=dd0279643b257ad1f01402e799bad4ed0e424fed;hb=a2de9cf491172cd5da9dc9ed60b17683dab6d7bc;hpb=2a8f032f9d3e1a78a31986a95ea72964a5b515b0

diff --git a/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp b/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
index dd02796..9ae46a1 100644
--- a/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
+++ b/dali-toolkit/internal/controls/renderers/border/border-renderer.cpp
@@ -38,7 +38,7 @@ namespace Internal
 namespace
 {
 const char * const RENDERER_TYPE("rendererType");
-const char * const RENDERER_TYPE_VALUE("borderRenderer");
+const char * const RENDERER_TYPE_VALUE("border");
 
 const char * const COLOR_NAME("borderColor");
 const char * const SIZE_NAME("borderSize");
@@ -174,8 +174,10 @@ void BorderRenderer::InitializeRenderer()
     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)
@@ -209,9 +211,8 @@ void BorderRenderer::RequireAntiAliasing( bool antiAliasing )
     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 );
@@ -292,15 +293,15 @@ Geometry BorderRenderer::CreateBorderGeometry()
   Property::Map borderVertexFormat;
   borderVertexFormat[POSITION_ATTRIBUTE_NAME] = Property::VECTOR2;
   borderVertexFormat[DRIFT_ATTRIBUTE_NAME] = Property::VECTOR2;
-  PropertyBuffer borderVertices = PropertyBuffer::New( borderVertexFormat, 16 );
-  borderVertices.SetData(borderVertexData);
+  PropertyBuffer borderVertices = PropertyBuffer::New( borderVertexFormat );
+  borderVertices.SetData( borderVertexData, 16 );
 
   // Create indices
   unsigned int indexData[24] = { 1,5,2,6,3,7,7,6,11,10,15,14,14,10,13,9,12,8,8,9,4,5,0,1};
   Property::Map indexFormat;
   indexFormat[INDEX_NAME] = Property::INTEGER;
-  PropertyBuffer indices = PropertyBuffer::New( indexFormat, 24 );
-  indices.SetData(indexData);
+  PropertyBuffer indices = PropertyBuffer::New( indexFormat );
+  indices.SetData( indexData, 24 );
 
   // Create the geometry object
   Geometry geometry = Geometry::New();