Fixing up Vulkan branch after merge to dali_1.3.26

[platform/core/uifw/dali-core.git] / dali / graphics / vulkan / shaders / text-visual-single-color-text-shader.frag

diff --git a/dali/graphics/vulkan/shaders/text-visual-single-color-text-shader.frag b/dali/graphics/vulkan/shaders/text-visual-single-color-text-shader.frag
index cc2efa4..5af011d 100644 (file)
--- a/dali/graphics/vulkan/shaders/text-visual-single-color-text-shader.frag
+++ b/dali/graphics/vulkan/shaders/text-visual-single-color-text-shader.frag
@@ -5,10 +5,8 @@ layout( location = 0 ) in vec2 vTexCoord;
 layout( set = 0, binding = 1, std140 ) uniform FragData
 {
   vec4 uTextColorAnimatable;
-  vec4 uAtlasRect;
   vec4 uColor;
   vec3 mixColor;
-  float opacity;
   float preMultipliedAlpha;
 };
 
@@ -16,16 +14,10 @@ layout( set = 0, binding = 2) uniform sampler2D sTexture;
 
 layout( location = 0 ) out vec4 fragColor;
 
-vec4 visualMixColor()
-{
-  return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );
-}
-
 void main()
 {
-  vec2 texCoord = clamp( mix( uAtlasRect.xy, uAtlasRect.zw, vTexCoord ), uAtlasRect.xy, uAtlasRect.zw );
-  float textTexture = texture( sTexture, texCoord ).r;
+  float textTexture = texture( sTexture, vTexCoord ).r;
 
   // Set the color of the text to what it is animated to.
-  fragColor = uTextColorAnimatable * textTexture * uColor * visualMixColor();
+  fragColor = uTextColorAnimatable * textTexture * uColor * vec4(mixColor,1.0);
 }