X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fgraphics%2Fshaders%2Fcolor-visual-shader.vert;h=29ad9846cc0ff0ea36ebb43325a8b6b5edd2804b;hb=66b48f5dc8be0614b57abf33e5d8cd833ea093d1;hp=f1688da302e662bc77e37e680fbb3c84025f8216;hpb=a6e73b84ce0442ad28197c3ef2ed1b48fa682508;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/dali-toolkit/internal/graphics/shaders/color-visual-shader.vert b/dali-toolkit/internal/graphics/shaders/color-visual-shader.vert
index f1688da..29ad984 100644
--- a/dali-toolkit/internal/graphics/shaders/color-visual-shader.vert
+++ b/dali-toolkit/internal/graphics/shaders/color-visual-shader.vert
@@ -17,15 +17,14 @@ uniform highp vec2 size;
 uniform mediump vec4 offsetSizeMode;
 uniform mediump vec2 origin;
 uniform mediump vec2 anchorPoint;
-#if !defined(IS_REQUIRED_BLUR) && defined(IS_REQUIRED_BORDERLINE)
-uniform mediump float borderlineWidth;
-uniform mediump float borderlineOffset;
-#endif
 #ifdef IS_REQUIRED_BLUR
 uniform mediump float blurRadius;
+#elif defined(IS_REQUIRED_BORDERLINE)
+uniform mediump float borderlineWidth;
+uniform mediump float borderlineOffset;
 #endif
 #ifdef IS_REQUIRED_ROUNDED_CORNER
-uniform mediump vec4 cornerRadius;
+uniform highp vec4 cornerRadius;
 uniform mediump float cornerRadiusPolicy;
 #endif
 uniform mediump vec2 extraSize;
@@ -41,7 +40,9 @@ vec4 ComputeVertexPosition()
 #endif
 
 #ifdef IS_REQUIRED_ROUNDED_CORNER
-#if !defined(IS_REQUIRED_BLUR) && defined(IS_REQUIRED_BORDERLINE)
+#ifdef IS_REQUIRED_BLUR
+  mediump float minSize = min(visualSize.x, visualSize.y);
+#elif defined(IS_REQUIRED_BORDERLINE)
   mediump float minSize = min(visualSize.x, visualSize.y) + (1.0 + clamp(borderlineOffset, -1.0, 1.0)) * borderlineWidth;
 #else
   mediump float minSize = min(visualSize.x, visualSize.y);