projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
24752f1
)
[4.0] Fixed text scroller pre multiplied alpha issue.
23/163123/1
accepted/tizen/4.0/unified/20171207.124753
submit/tizen_4.0/20171207.094309
author
Jinho, Lee
<jeano.lee@samsung.com>
Thu, 7 Dec 2017 09:02:05 +0000
(18:02 +0900)
committer
Jinho, Lee
<jeano.lee@samsung.com>
Thu, 7 Dec 2017 09:02:05 +0000
(18:02 +0900)
Change-Id: Id35f46c30af5b5f14536a879af93f299e467db26
dali-toolkit/internal/text/text-scroller.cpp
patch
|
blob
|
history
diff --git
a/dali-toolkit/internal/text/text-scroller.cpp
b/dali-toolkit/internal/text/text-scroller.cpp
index
6f57700
..
f8089a2
100644
(file)
--- a/
dali-toolkit/internal/text/text-scroller.cpp
+++ b/
dali-toolkit/internal/text/text-scroller.cpp
@@
-97,6
+97,7
@@
const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
discard;\n
\n
mediump vec4 textTexture = texture2D( sTexture, vTexCoord );\n
+ textTexture.rgb *= mix( 1.0, textTexture.a, preMultipliedAlpha );\n
\n
gl_FragColor = textTexture * uColor * visualMixColor();
}\n