X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Frenderers%2Fcolor%2Fcolor-renderer.cpp;h=c7e4ed5dc6a4d6d01dce028e2f0827572b084fe1;hp=b6074eb478bb411e1712a293261c2e1aaef1be22;hb=a4246093982a7c45fd622253d8245e447878a1af;hpb=4bf366c7c657eacb5cf150fa52e34263ca16218f diff --git a/dali-toolkit/internal/controls/renderers/color/color-renderer.cpp b/dali-toolkit/internal/controls/renderers/color/color-renderer.cpp index b6074eb..c7e4ed5 100644 --- a/dali-toolkit/internal/controls/renderers/color/color-renderer.cpp +++ b/dali-toolkit/internal/controls/renderers/color/color-renderer.cpp @@ -40,8 +40,6 @@ namespace const char * const RENDERER_TYPE("rendererType"); const char * const RENDERER_TYPE_VALUE("colorRenderer"); const char * const COLOR_NAME("blendColor"); -const char * const COLOR_UNIFORM_NAME("uBlendColor"); - const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( attribute mediump vec2 aPosition;\n @@ -58,11 +56,11 @@ const char* VERTEX_SHADER = DALI_COMPOSE_SHADER( const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER( uniform lowp vec4 uColor;\n - uniform lowp vec4 uBlendColor;\n + uniform lowp vec4 blendColor;\n \n void main()\n {\n - gl_FragColor = uBlendColor*uColor;\n + gl_FragColor = blendColor*uColor;\n }\n ); } @@ -136,7 +134,7 @@ void ColorRenderer::InitializeRenderer() Material material = Material::New( shader ); mImpl->mRenderer = Renderer::New( geometry, material ); - mBlendColorIndex = mImpl->mRenderer.RegisterProperty( COLOR_UNIFORM_NAME, mBlendColor ); + mBlendColorIndex = mImpl->mRenderer.RegisterProperty( COLOR_NAME, mBlendColor ); if( mBlendColor.a < 1.f ) { mImpl->mRenderer.GetMaterial().SetBlendMode( BlendingMode::ON );