X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fgraphics%2Fshaders%2Fgradient-visual-shader.frag;h=752ecdbd27b67b072e7ed53915bbac1a29f92c63;hb=663892e5b10e7c9b2f23e2e99b5b7865784f1d0a;hp=c2b9c5d2b01aca69373657ad2825c9fc8f1a74ea;hpb=49d75e1313a28f0c87cb8b84b33bf451190a5d76;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.frag b/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.frag index c2b9c5d..752ecdb 100644 --- a/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.frag +++ b/dali-toolkit/internal/graphics/shaders/gradient-visual-shader.frag @@ -3,6 +3,7 @@ INPUT mediump vec2 vTexCoord; INPUT mediump vec2 vPosition; INPUT mediump vec2 vRectSize; INPUT mediump vec2 vOptRectSize; +INPUT mediump float vAliasMargin; #ifdef IS_REQUIRED_ROUNDED_CORNER INPUT mediump vec4 vCornerRadius; #endif @@ -11,11 +12,6 @@ INPUT mediump vec4 vCornerRadius; // scale factor to fit start and end position of gradient. uniform mediump float uTextureCoordinateScaleFactor; -#if defined(IS_REQUIRED_ROUNDED_CORNER) || defined(IS_REQUIRED_BORDERLINE) -// Be used when we calculate anti-alias range near 1 pixel. -uniform highp vec3 uScale; -#endif - uniform sampler2D sTexture; // sampler1D? uniform lowp vec4 uColor; uniform lowp vec3 mixColor; @@ -77,10 +73,7 @@ void calculatePotential() void setupMinMaxPotential() { - // Set soft anti-alias range at most 10% of visual size. - // The range should be inverse proportion with scale of view. - // To avoid divid-by-zero, let we allow minimum scale value is 0.001 (0.1%) - gPotentialRange = min(1.0, max(vRectSize.x, vRectSize.y) * 0.2) / max(0.001, max(uScale.x, uScale.y)); + gPotentialRange = vAliasMargin; gMaxOutlinePotential = gRadius + gPotentialRange; gMinOutlinePotential = gRadius - gPotentialRange;