projects
/
platform
/
upstream
/
wayland.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
32ff690
)
Define MULT outside the HAVE_CAIRO_GL #ifdef
author
Kristian Høgsberg
<krh@bitplanet.net>
Mon, 29 Nov 2010 13:13:35 +0000
(08:13 -0500)
committer
Kristian Høgsberg
<krh@bitplanet.net>
Mon, 29 Nov 2010 13:13:35 +0000
(08:13 -0500)
clients/window.c
patch
|
blob
|
history
diff --git
a/clients/window.c
b/clients/window.c
index
bc76937
..
ae55819
100644
(file)
--- a/
clients/window.c
+++ b/
clients/window.c
@@
-161,6
+161,9
@@
struct surface_data {
struct wl_buffer *buffer;
};
+#define MULT(_d,c,a,t) \
+ do { t = c * a + 0x7f; _d = ((t >> 8) + t) >> 8; } while (0)
+
#ifdef HAVE_CAIRO_GL
struct drm_surface_data {
@@
-282,9
+285,6
@@
display_create_drm_surface_from_file(struct display *display,
while (p < end) {
unsigned int t;
-#define MULT(_d,c,a,t) \
- do { t = c * a + 0x7f; _d = ((t >> 8) + t) >> 8; } while (0)
-
MULT(p[0], p[0], p[3], t);
MULT(p[1], p[1], p[3], t);
MULT(p[2], p[2], p[3], t);