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
Fixed regression with Actor::COLOR property in TextLabel
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
rendering
/
atlas
/
atlas-glyph-manager-impl.cpp
diff --git
a/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
b/dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
index
0a90ef2
..
c8ea1e2
100644
(file)
--- a/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
+++ b/
dali-toolkit/internal/text/rendering/atlas/atlas-glyph-manager-impl.cpp
@@
-48,6
+48,7
@@
void main()
);
const char* FRAGMENT_SHADER_L8 = MAKE_SHADER(
);
const char* FRAGMENT_SHADER_L8 = MAKE_SHADER(
+uniform lowp vec4 uColor;
uniform sampler2D sTexture;
varying mediump vec2 vTexCoord;
varying mediump vec4 vColor;
uniform sampler2D sTexture;
varying mediump vec2 vTexCoord;
varying mediump vec4 vColor;
@@
-55,7
+56,7
@@
varying mediump vec4 vColor;
void main()
{
mediump vec4 color = texture2D( sTexture, vTexCoord );
void main()
{
mediump vec4 color = texture2D( sTexture, vTexCoord );
- gl_FragColor = vec4( vColor.rgb
, v
Color.a * color.r );
+ gl_FragColor = vec4( vColor.rgb
* uColor.rgb, vColor.a * u
Color.a * color.r );
}
);
}
);