Mesa (main): dzn: Fix winsys reporting

[GitLab Mirror]

Module: Mesa
Branch: main
Commit: 6ee9002ff6453d5b51754ae04c9b892e2c232ddf
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=6ee9002ff6453d5b51754ae04c9b892e2c232ddf

Author: Jesse Natalie <jenatali at microsoft.com>
Date:   Sat Jul  2 11:08:46 2022 -0700

dzn: Fix winsys reporting

For Windows we don't support using the DISPLAY winsys,
and for WSL we should add the ones that support software

Reviewed-by: Jason Ekstrand <jason.ekstrand at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17346>

---

 src/microsoft/vulkan/dzn_device.c | 17 +++++++++++------
 1 file changed, 11 insertions(+), 6 deletions(-)

diff --git a/src/microsoft/vulkan/dzn_device.c b/src/microsoft/vulkan/dzn_device.c
index ba74f5b6581..9b5f82c3fbc 100644
--- a/src/microsoft/vulkan/dzn_device.c
+++ b/src/microsoft/vulkan/dzn_device.c
@@ -55,7 +55,9 @@
 #include <directx/d3d12sdklayers.h>
 
 #if defined(VK_USE_PLATFORM_WIN32_KHR) || \
-    defined(VK_USE_PLATFORM_DISPLAY_KHR)
+    defined(VK_USE_PLATFORM_WAYLAND_KHR) || \
+    defined(VK_USE_PLATFORM_XCB_KHR) || \
+    defined(VK_USE_PLATFORM_XLIB_KHR)
 #define DZN_USE_WSI_PLATFORM
 #endif
 
@@ -71,11 +73,14 @@ static const struct vk_instance_extension_table instance_extensions = {
 #ifdef VK_USE_PLATFORM_WIN32_KHR
    .KHR_win32_surface                        = true,
 #endif
-#ifdef VK_USE_PLATFORM_DISPLAY_KHR
-   .KHR_display                              = true,
-   .KHR_get_display_properties2              = true,
-   .EXT_direct_mode_display                  = true,
-   .EXT_display_surface_counter              = true,
+#ifdef VK_USE_PLATFORM_XCB_KHR
+   .KHR_xcb_surface                          = true,
+#endif
+#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+   .KHR_wayland_surface                      = true,
+#endif
+#ifdef VK_USE_PLATFORM_XLIB_KHR
+   .KHR_xlib_surface                         = true,
 #endif
    .EXT_debug_report                         = true,
    .EXT_debug_utils                          = true,