Mesa (master): virgl: move new added field to the end.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 5322572c7825f55e583ccc37a01c4b6f891c9821
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5322572c7825f55e583ccc37a01c4b6f891c9821

Author: Lepton Wu <lepton at chromium.org>
Date:   Mon Apr 19 14:18:58 2021 -0700

virgl: move new added field to the end.

This field was introduced 2 months ago and it breaks virgl
compatibility between guest/host. Switch the new added field
to the end. We will still have compatibility issue but the
"bug window" is much smaller.

Fixes: e778aceaae0 ("virgl: update headers")

Signed-off-by: Lepton Wu <lepton at chromium.org>
Reviewed-by: Gert Wollny <gert.wollny at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10333>

---

 src/virtio/virtio-gpu/virgl_hw.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/virtio/virtio-gpu/virgl_hw.h b/src/virtio/virtio-gpu/virgl_hw.h
index a368ffa5e45..1286b48a880 100644
--- a/src/virtio/virtio-gpu/virgl_hw.h
+++ b/src/virtio/virtio-gpu/virgl_hw.h
@@ -593,8 +593,8 @@ struct virgl_caps_v2 {
         uint32_t host_feature_check_version;
         struct virgl_supported_format_mask supported_readback_formats;
         struct virgl_supported_format_mask scanout;
-        uint32_t max_video_memory;
         uint32_t capability_bits_v2;
+        uint32_t max_video_memory;
 };
 
 union virgl_caps {