projects
/
profile
/
ivi
/
weston-ivi-shell.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
29a9cf0
)
compositor: Support alpha for solid color surfaces
author
Kristian Høgsberg
<krh@bitplanet.net>
Thu, 29 Mar 2012 15:34:39 +0000
(11:34 -0400)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Thu, 29 Mar 2012 15:34:39 +0000
(11:34 -0400)
src/compositor.c
patch
|
blob
|
history
diff --git
a/src/compositor.c
b/src/compositor.c
index
f9e1f23
..
60142d1
100644
(file)
--- a/
src/compositor.c
+++ b/
src/compositor.c
@@
-2156,9
+2156,10
@@
static const char texture_fragment_shader[] =
static const char solid_fragment_shader[] =
"precision mediump float;\n"
"uniform vec4 color;\n"
+ "uniform float alpha;\n"
"void main()\n"
"{\n"
- " gl_FragColor = color\n;"
+ " gl_FragColor =
alpha *
color\n;"
"}\n";
static int