From 924d1ba9eb03279b51ee2439aa027fb73cb3f8c2 Mon Sep 17 00:00:00 2001
From: Mike Blumenkrantz <michael.blumenkrantz@gmail.com>
Date: Thu, 31 Dec 2020 12:47:58 -0500
Subject: [PATCH] zink: enable WSI-faking for RADV too

temporary until we get real WSI support

Reviewed-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/8284>
---
 src/gallium/drivers/zink/zink_screen.c | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/zink/zink_screen.c b/src/gallium/drivers/zink/zink_screen.c
index 9809ffbe869..eb2efc21257 100644
--- a/src/gallium/drivers/zink/zink_screen.c
+++ b/src/gallium/drivers/zink/zink_screen.c
@@ -986,9 +986,13 @@ zink_internal_setup_moltenvk(struct zink_screen *screen)
 static void
 check_device_needs_mesa_wsi(struct zink_screen *screen)
 {
-   /* Raspberry Pi 4 V3DV driver */
-   if (screen->info.props.vendorID == 0x14E4 &&
-       screen->info.props.deviceID == 42) {
+   if (
+       /* Raspberry Pi 4 V3DV driver */
+       (screen->info.props.vendorID == 0x14E4 &&
+        screen->info.props.deviceID == 42) ||
+       /* RADV */
+       screen->info.driver_props.driverID == VK_DRIVER_ID_MESA_RADV_KHR
+      ) {
       screen->needs_mesa_wsi = true;
    }
 }