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
Replace visual opacity with Renderer's opacity
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
color
/
color-visual.cpp
diff --git
a/dali-toolkit/internal/visuals/color/color-visual.cpp
b/dali-toolkit/internal/visuals/color/color-visual.cpp
index
8228550
..
fdc4835
100644
(file)
--- a/
dali-toolkit/internal/visuals/color/color-visual.cpp
+++ b/
dali-toolkit/internal/visuals/color/color-visual.cpp
@@
-72,11
+72,10
@@
const char* VERTEX_SHADER = DALI_COMPOSE_SHADER(
const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
uniform lowp vec4 uColor;\n
uniform lowp vec3 mixColor;\n
const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
uniform lowp vec4 uColor;\n
uniform lowp vec3 mixColor;\n
- uniform lowp float opacity;\n
\n
void main()\n
{\n
\n
void main()\n
{\n
- gl_FragColor = vec4(mixColor,
opacity
)*uColor;\n
+ gl_FragColor = vec4(mixColor,
1.0
)*uColor;\n
}\n
);
}
}\n
);
}