summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
25ce015)
Fading demos such as popup and contact view were showing text too early / too late.
This patch fixes these demos.
Change-Id: I54aa32311ca27f9169f7b196d45a111ef0965f95
Signed-off-by: David Steele <david.steele@samsung.com>
void main()
{
mediump vec4 color = texture2D( sTexture, vTexCoord );
void main()
{
mediump vec4 color = texture2D( sTexture, vTexCoord );
- gl_FragColor = vec4( vColor.rgb * uColor.rgb * textColorAnimatable.rgb, vColor.a * textColorAnimatable.a * color.r );
+ gl_FragColor = vec4( vColor.rgb * uColor.rgb * textColorAnimatable.rgb, uColor.a * vColor.a * textColorAnimatable.a * color.r );