diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2015-09-22 00:37:05 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2015-09-22 00:37:05 +0100 |
| commit | 6138fbdebd72f6822367e88d14ddc635b5a5ddfb (patch) | |
| tree | 864519f233d3af381e6396b94efbb3afa4d3052a | |
| parent | 9e72681d16792d0ffc42bab634b1753ff299bdfd (diff) | |
| parent | b2af43cc379e1d4c30d92af257bedebf0e3f618a (diff) | |
| download | qemu-6138fbdebd72f6822367e88d14ddc635b5a5ddfb.zip qemu-6138fbdebd72f6822367e88d14ddc635b5a5ddfb.tar.gz qemu-6138fbdebd72f6822367e88d14ddc635b5a5ddfb.tar.bz2 | |
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20150921-1' into staging
spice: surface switch fast path requires same format too.
# gpg: Signature made Mon 21 Sep 2015 10:05:54 BST using RSA key ID D3E87138
# 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>"
* remotes/spice/tags/pull-spice-20150921-1:
spice: surface switch fast path requires same format too.
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
| -rw-r--r-- | ui/spice-display.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/spice-display.c b/ui/spice-display.c index 77c8cba..0489131 100644 --- a/ui/spice-display.c +++ b/ui/spice-display.c @@ -408,7 +408,8 @@ void qemu_spice_display_switch(SimpleSpiceDisplay *ssd, if (surface && ssd->surface && surface_width(surface) == pixman_image_get_width(ssd->surface) && - surface_height(surface) == pixman_image_get_height(ssd->surface)) { + surface_height(surface) == pixman_image_get_height(ssd->surface) && + surface_format(surface) == pixman_image_get_format(ssd->surface)) { /* no-resize fast path: just swap backing store */ dprint(1, "%s/%d: fast (%dx%d)\n", __func__, ssd->qxl.id, surface_width(surface), surface_height(surface)); |