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
Ensure not to emit the resource ready signal during the callback
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-scroller.cpp
diff --git
a/dali-toolkit/internal/text/text-scroller.cpp
b/dali-toolkit/internal/text/text-scroller.cpp
index
6d0930b
..
b2c1b19
100755
(executable)
--- a/
dali-toolkit/internal/text/text-scroller.cpp
+++ b/
dali-toolkit/internal/text/text-scroller.cpp
@@
-42,7
+42,7
@@
const int MINIMUM_SCROLL_SPEED = 1; // Speed should be set by Property system.
const char* VERTEX_SHADER_SCROLL = DALI_COMPOSE_SHADER(
attribute mediump vec2 aPosition;\n
varying highp vec2 vTexCoord;\n
const char* VERTEX_SHADER_SCROLL = DALI_COMPOSE_SHADER(
attribute mediump vec2 aPosition;\n
varying highp vec2 vTexCoord;\n
- uniform
medium
p vec3 uSize;\n
+ uniform
high
p vec3 uSize;\n
uniform mediump float uDelta;\n
uniform mediump vec2 uTextureSize;\n
uniform mediump float uGap;\n
uniform mediump float uDelta;\n
uniform mediump vec2 uTextureSize;\n
uniform mediump float uGap;\n
@@
-53,7
+53,7
@@
const char* VERTEX_SHADER_SCROLL = DALI_COMPOSE_SHADER(
\n
//Visual size and offset
uniform mediump vec2 offset;\n
\n
//Visual size and offset
uniform mediump vec2 offset;\n
- uniform
medium
p vec2 size;\n
+ uniform
high
p vec2 size;\n
uniform mediump vec4 offsetSizeMode;\n
uniform mediump vec2 origin;\n
uniform mediump vec2 anchorPoint;\n
uniform mediump vec4 offsetSizeMode;\n
uniform mediump vec2 origin;\n
uniform mediump vec2 anchorPoint;\n