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
[dali_2.0.29] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
graphics
/
shaders
/
color-visual-rounded-corner-shader.vert
diff --git
a/dali-toolkit/internal/graphics/shaders/color-visual-rounded-corner-shader.vert
b/dali-toolkit/internal/graphics/shaders/color-visual-rounded-corner-shader.vert
index
f4bc1ad
..
0a6a257
100644
(file)
--- a/
dali-toolkit/internal/graphics/shaders/color-visual-rounded-corner-shader.vert
+++ b/
dali-toolkit/internal/graphics/shaders/color-visual-rounded-corner-shader.vert
@@
-1,7
+1,8
@@
INPUT mediump vec2 aPosition;
OUTPUT mediump vec2 vPosition;
OUTPUT mediump vec2 vRectSize;
INPUT mediump vec2 aPosition;
OUTPUT mediump vec2 vPosition;
OUTPUT mediump vec2 vRectSize;
-OUTPUT mediump float vCornerRadius;
+OUTPUT mediump vec2 vOptRectSize;
+OUTPUT mediump vec4 vCornerRadius;
uniform highp mat4 uMvpMatrix;
uniform highp vec3 uSize;
uniform highp mat4 uMvpMatrix;
uniform highp vec3 uSize;
@@
-13,7
+14,7
@@
uniform mediump vec2 extraSize;
uniform mediump vec4 offsetSizeMode;
uniform mediump vec2 origin;
uniform mediump vec2 anchorPoint;
uniform mediump vec4 offsetSizeMode;
uniform mediump vec2 origin;
uniform mediump vec2 anchorPoint;
-uniform mediump
float
cornerRadius;
+uniform mediump
vec4
cornerRadius;
uniform mediump float cornerRadiusPolicy;
vec4 ComputeVertexPosition()
uniform mediump float cornerRadiusPolicy;
vec4 ComputeVertexPosition()
@@
-23,7
+24,10
@@
vec4 ComputeVertexPosition()
mediump float minSize = min( visualSize.x, visualSize.y );
vCornerRadius = mix( cornerRadius * minSize, cornerRadius, cornerRadiusPolicy);
vCornerRadius = min( vCornerRadius, minSize * 0.5 );
mediump float minSize = min( visualSize.x, visualSize.y );
vCornerRadius = mix( cornerRadius * minSize, cornerRadius, cornerRadiusPolicy);
vCornerRadius = min( vCornerRadius, minSize * 0.5 );
- vRectSize = visualSize / 2.0 - vCornerRadius;
+ vRectSize = visualSize / 2.0;
+ // optimize fragment shader
+ mediump float maxRadius = max(max(vCornerRadius.x, vCornerRadius.y), max(vCornerRadius.z, vCornerRadius.w));
+ vOptRectSize = vRectSize - 0.2929 * maxRadius - 1.0;
vPosition = aPosition* visualSize;
return vec4( vPosition + anchorPoint*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );
}
vPosition = aPosition* visualSize;
return vec4( vPosition + anchorPoint*visualSize + (visualOffset + origin)*uSize.xy, 0.0, 1.0 );
}
@@
-31,4
+35,4
@@
vec4 ComputeVertexPosition()
void main()
{
gl_Position = uMvpMatrix * ComputeVertexPosition();
void main()
{
gl_Position = uMvpMatrix * ComputeVertexPosition();
-}
\ No newline at end of file
+}