From 5a2ef2df28037367d84f059077b432913625f141 Mon Sep 17 00:00:00 2001
From: Yiwei Zhang <zzyiwei@chromium.org>
Date: Mon, 18 Aug 2025 22:32:28 -0700
Subject: [PATCH] venus: hide swapchainMaintenance1 behind wsi guard

..otherwise would give false alarm on Android.

Fixes: acd54970673 ("venus: support wsi maintenance1 extensions")
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/36834>
(cherry picked from commit fd0b41b98d1eef5727a3a951b77707328911daf3)
---
 .pick_status.json                      | 2 +-
 src/virtio/vulkan/vn_physical_device.c | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/.pick_status.json b/.pick_status.json
index 1e21cf5232d..217688916b3 100644
--- a/.pick_status.json
+++ b/.pick_status.json
@@ -5834,7 +5834,7 @@
         "description": "venus: hide swapchainMaintenance1 behind wsi guard",
         "nominated": true,
         "nomination_type": 2,
-        "resolution": 0,
+        "resolution": 1,
         "main_sha": null,
         "because_sha": "acd5497067389df5f798e4dfc2075580ca5c0412",
         "notes": null
diff --git a/src/virtio/vulkan/vn_physical_device.c b/src/virtio/vulkan/vn_physical_device.c
index 8a58b624613..77fff991e56 100644
--- a/src/virtio/vulkan/vn_physical_device.c
+++ b/src/virtio/vulkan/vn_physical_device.c
@@ -406,7 +406,10 @@ vn_physical_device_init_features(struct vn_physical_device *physical_dev)
     * See vn_physical_device_get_native_extensions.
     */
    feats->deviceMemoryReport = true;
+
+#ifdef VN_USE_WSI_PLATFORM
    feats->swapchainMaintenance1 = true;
+#endif
 
    /* Host commands require custom protocol level support. Disable it
     * since it'd be non-trivial to make it performant.