venus: reorder version fields in vn_instance

Signed-off-by: Chia-I Wu <olvaffe@gmail.com>
Reviewed-by: Yiwei Zhang <zzyiwei@chromium.org>
Reviewed-by: Ryan Neph <ryanneph@google.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/12568>

diff --git a/src/virtio/vulkan/vn_instance.h b/src/virtio/vulkan/vn_instance.h
index 226cc0e2da8203249fef764f7cb79bde865c9006..14e2ac5846b96247b876c2d0774896590ef3e758 100644 (file)
--- a/src/virtio/vulkan/vn_instance.h
+++ b/src/virtio/vulkan/vn_instance.h
@@ -39,17 +39,6 @@ struct vn_instance {
    struct vn_renderer *renderer;
    struct vn_renderer_info renderer_info;
 
-   /* Between the driver and the app, VN_MAX_API_VERSION is what we advertise
-    * and base.base.app_info.api_version is what the app requests.
-    *
-    * Between the driver and the renderer, renderer_api_version is the api
-    * version we request internally, which can be higher than
-    * base.base.app_info.api_version.  renderer_version is the instance
-    * version we can use internally.
-    */
-   uint32_t renderer_api_version;
-   uint32_t renderer_version;
-
    /* to synchronize renderer/ring */
    mtx_t roundtrip_mutex;
    uint32_t roundtrip_next;
@@ -71,6 +60,17 @@ struct vn_instance {
       void *ptr;
    } reply;
 
+   /* Between the driver and the app, VN_MAX_API_VERSION is what we advertise
+    * and base.base.app_info.api_version is what the app requests.
+    *
+    * Between the driver and the renderer, renderer_api_version is the api
+    * version we request internally, which can be higher than
+    * base.base.app_info.api_version.  renderer_version is the instance
+    * version we can use internally.
+    */
+   uint32_t renderer_api_version;
+   uint32_t renderer_version;
+
    struct {
       mtx_t mutex;
       bool initialized;