spice: surface switch fast path requires same format too.

-----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
 iQIcBAABAgAGBQJV/8hyAAoJEEy22O7T6HE4LQIP/1OvMsVoFZ7n7MPcnqBZwK35
 3u7wKbVtoAdj39TvSbIaxImtMs3cro6CNbyDxYmCHnjOjbsh9ZX9sMzbxFNENLmK
 g8wAZr8GKlbvJzgpNwg/CxtOishxLWY4ANXNWb9VrZLHe/CuIE7Om1q/TEeoyMew
 r+iq2TdC66SB+YJcWroFmRWss+hpQB5tZA+JkSsNE5Sb5aSs5UQ06zfrWIQ7dHhD
 QAOVnp1OQvG0v5KfHykWHeTci9jXVlE7+Jnp+cMFi3zg1fqjNPowJ3/8ZKDKLi36
 BWwY+cddREcOIut3te9qRaruWVAZrzr8zlqyMIfeZFWPMjeqx4/EfmQCgybDEmoQ
 IakU4jXYgYk2k1H6aZMmqRBaDKsRI8iyO+fPmT8P8vvstfBrWh2deizHZ8Nliofk
 ZvuSknh/myWwCFnE/PyFM4Haj30IjeoeMYpfpWgkYbA2MOAS7H9a2lDZ8haejV8a
 phRZBeBjDqAizWxNRpUQAFpylnd7M/pvDJrg2PVoMZDLkyrF+liLj/6d+EPr546v
 DJ7QxRb5jwIeQVpymBnRXrXOIM6Z9tyHOueJimP0dKcMdfsIR9LHWdalBFfipfzm
 DsRtGqSa1q69okerm3PHCpoQ8rVXuMgG9O2HTSCg0vxDSsrzsFkxYZjKlAGnivOi
 +rY+xNW8HlPhsNxj3pgZ
 =azzw
 -----END PGP SIGNATURE-----

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>
This commit is contained in:
Peter Maydell 2015-09-22 00:37:05 +01:00
commit 6138fbdebd

View File

@ -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));