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
Merge "Change the fitting mode to FILL" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
border
/
border-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/border/border-visual.cpp
b/dali-toolkit/internal/visuals/border/border-visual.cpp
index
cf1d6f4
..
993bcde
100644
(file)
--- a/
dali-toolkit/internal/visuals/border/border-visual.cpp
+++ b/
dali-toolkit/internal/visuals/border/border-visual.cpp
@@
-83,11
+83,10
@@
const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
uniform lowp vec4 uColor;\n
uniform lowp vec4 borderColor;\n
uniform lowp vec3 mixColor;\n
uniform lowp vec4 uColor;\n
uniform lowp vec4 borderColor;\n
uniform lowp vec3 mixColor;\n
- uniform lowp float opacity;\n
\n
void main()\n
{\n
\n
void main()\n
{\n
- gl_FragColor = vec4(mixColor,
opacity
)*borderColor*uColor;\n
+ gl_FragColor = vec4(mixColor,
1.0
)*borderColor*uColor;\n
}\n
);
}\n
);
@@
-111,13
+110,12
@@
const char* FRAGMENT_SHADER_ANTI_ALIASING = DALI_COMPOSE_SHADER(
uniform lowp vec4 uColor;\n
uniform lowp vec4 borderColor;\n
uniform lowp vec3 mixColor;\n
uniform lowp vec4 uColor;\n
uniform lowp vec4 borderColor;\n
uniform lowp vec3 mixColor;\n
- uniform lowp float opacity;\n
uniform mediump float borderSize;\n
varying mediump float vAlpha;\n
\n
void main()\n
{\n
uniform mediump float borderSize;\n
varying mediump float vAlpha;\n
\n
void main()\n
{\n
- gl_FragColor = vec4(mixColor,
opacity
)*borderColor*uColor;\n
+ gl_FragColor = vec4(mixColor,
1.0
)*borderColor*uColor;\n
gl_FragColor.a *= smoothstep(0.0, 1.5, vAlpha)*smoothstep( borderSize+1.5, borderSize, vAlpha );\n
}\n
);
gl_FragColor.a *= smoothstep(0.0, 1.5, vAlpha)*smoothstep( borderSize+1.5, borderSize, vAlpha );\n
}\n
);