aboutsummaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2017-09-05 16:01:15 +0200
committerGerd Hoffmann <kraxel@redhat.com>2017-09-13 10:15:43 +0200
commitc12b6d70e384c769ca372e15ffd19b3e9f563662 (patch)
treeab0e37d52b4184c73710b2ebfdaa15767a948aea /ui
parent619c200f6ce2f44fbc8a5732174530c3b4782aab (diff)
downloadqemu-c12b6d70e384c769ca372e15ffd19b3e9f563662.zip
qemu-c12b6d70e384c769ca372e15ffd19b3e9f563662.tar.gz
qemu-c12b6d70e384c769ca372e15ffd19b3e9f563662.tar.bz2
pixman: drop submodule
Drop pixman submodule and support for the "internal" pixman build. pixman should be reasonably well established meanwhile so we don't need the fallback submodule any more. While being at it also drop some #ifdefs for pixman versions older than what we require in configure anyway. Signed-off-by: Gerd Hoffmann <kraxel@redhat.com> Message-id: 20170905140116.28181-2-kraxel@redhat.com
Diffstat (limited to 'ui')
-rw-r--r--ui/qemu-pixman.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c
index 6e8b83a..6e591ab 100644
--- a/ui/qemu-pixman.c
+++ b/ui/qemu-pixman.c
@@ -96,17 +96,13 @@ int qemu_pixman_get_type(int rshift, int gshift, int bshift)
if (bshift == 0) {
type = PIXMAN_TYPE_ARGB;
} else {
-#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0, 21, 8)
type = PIXMAN_TYPE_RGBA;
-#endif
}
} else if (rshift < gshift && gshift < bshift) {
if (rshift == 0) {
type = PIXMAN_TYPE_ABGR;
} else {
-#if PIXMAN_VERSION >= PIXMAN_VERSION_ENCODE(0, 16, 0)
type = PIXMAN_TYPE_BGRA;
-#endif
}
}
return type;