diff options
| author | Peter Maydell | 2017-09-14 14:44:17 +0200 |
|---|---|---|
| committer | Peter Maydell | 2017-09-14 14:44:17 +0200 |
| commit | 0c9ddf716eab60c49fcf3bfd7e5ae968173a06c7 (patch) | |
| tree | a78392b7d1b0433162c0d0aff74db6f39613a4df /ui/qemu-pixman.c | |
| parent | Merge remote-tracking branch 'remotes/kraxel/tags/vga-20170913-pull-request' ... (diff) | |
| parent | console: add question-mark escape operator (diff) | |
| download | qemu-0c9ddf716eab60c49fcf3bfd7e5ae968173a06c7.tar.gz qemu-0c9ddf716eab60c49fcf3bfd7e5ae968173a06c7.tar.xz qemu-0c9ddf716eab60c49fcf3bfd7e5ae968173a06c7.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20170913-pull-request' into staging
ui: console fixes
drop pixman submodule
# gpg: Signature made Wed 13 Sep 2017 09:40:34 BST
# gpg: using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20170913-pull-request:
console: add question-mark escape operator
console: fix dpy_gfx_replace_surface assert
pixman: drop configure switches
pixman: drop submodule
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/qemu-pixman.c')
| -rw-r--r-- | ui/qemu-pixman.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c index 6e8b83add6..6e591ab821 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; |