Commit 6138fbde authored Sep 22, 2015 by Peter Maydell

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>

parents 9e72681d b2af43cc

ui/spice-display.c

+2 −1

Original line number	Diff line number	Diff line
		@@ -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));