Merge "(Vector) Support asynchronous file loading" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / graphics / shaders / text-visual-single-color-text-with-style-and-emoji-shader.frag

diff --git a/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-style-and-emoji-shader.frag b/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-style-and-emoji-shader.frag
index b892a17..0d82aa7 100644 (file)
--- a/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-style-and-emoji-shader.frag
+++ b/dali-toolkit/internal/graphics/shaders/text-visual-single-color-text-with-style-and-emoji-shader.frag
@@ -1,6 +1,7 @@
 varying mediump vec2 vTexCoord;
 uniform sampler2D sTexture;
 uniform sampler2D sStyle;
+uniform sampler2D sOverlayStyle;
 uniform sampler2D sMask;
 uniform lowp float uHasMultipleTextColors;
 uniform lowp vec4 uTextColorAnimatable;
@@ -11,6 +12,7 @@ void main()
 {
   mediump vec4 textTexture = texture2D( sTexture, vTexCoord );
   mediump vec4 styleTexture = texture2D( sStyle, vTexCoord );
+  mediump vec4 overlayStyleTexture = texture2D( sOverlayStyle, vTexCoord );
   mediump float maskTexture = texture2D( sMask, vTexCoord ).r;
 
   // Set the color of non-transparent pixel in text to what it is animated to.
@@ -20,5 +22,5 @@ void main()
   textTexture.rgb = mix( textTexture.rgb, uTextColorAnimatable.rgb, vstep * maskTexture * ( 1.0 - uHasMultipleTextColors ) );
 
   // Draw the text as overlay above the style
-  gl_FragColor = ( textTexture + styleTexture * ( 1.0 - textTexture.a ) ) * uColor * vec4( mixColor, 1.0 );
+  gl_FragColor = ( overlayStyleTexture + textTexture * (1.0 - overlayStyleTexture.a) + styleTexture * ( 1.0 - textTexture.a ) * (1.0 - overlayStyleTexture.a) ) * uColor * vec4( mixColor, 1.0 );
 }