summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerd Hoffmann <kraxel@redhat.com>2015-09-18 12:07:18 +0200
committerGerd Hoffmann <kraxel@redhat.com>2015-09-21 09:52:07 +0200
commitb2af43cc379e1d4c30d92af257bedebf0e3f618a (patch)
tree7d73ddd4e1ea407b511f5cd4704b32730bf71336
parent18640989a9f5e4d2e84b566c52ff1fccfa0dbf4a (diff)
spice: surface switch fast path requires same format too.pull-spice-20150921-1
Commit "555e72f spice: rework mirror allocation, add no-resize fast path" adds a fast path for surface switches which does't go through the full primary surface destroy and re-recreation in case the new surface is identical to the old one (page-flip). It checks the size only though, but the format must be identical too. This patch adds the format check. Commit "0002a51 ui/spice: Support shared surface for most pixman formats" increases the chance to actually trigger this. https://bugzilla.redhat.com/show_bug.cgi?id=1247479 Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
-rw-r--r--ui/spice-display.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/ui/spice-display.c b/ui/spice-display.c
index 77c8cbab88..0489131968 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));