From f6b55115469acde307c8b4417b6a230eb023c0df Mon Sep 17 00:00:00 2001
From: kd-11 <karokidii@gmail.com>
Date: Sat, 3 Aug 2024 15:58:44 +0300
Subject: [PATCH] Improved wayland support

---
 rpcs3/CMakeLists.txt                  |  4 ++++
 rpcs3/Emu/RSX/VK/vkutils/instance.hpp |  2 +-
 rpcs3/rpcs3qt/gs_frame.cpp            | 10 ++++------
 3 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/rpcs3/CMakeLists.txt b/rpcs3/CMakeLists.txt
index 182d818f04..226a126f26 100644
--- a/rpcs3/CMakeLists.txt
+++ b/rpcs3/CMakeLists.txt
@@ -27,6 +27,10 @@ if(UNIX AND NOT APPLE)
     if(X11_FOUND)
         add_definitions(-DHAVE_X11)
     endif()
+    find_package(Wayland)
+    if(WAYLAND_FOUND)
+        add_definitions(-DHAVE_WAYLAND)
+    endif()
 endif()
 
 # Qt
diff --git a/rpcs3/Emu/RSX/VK/vkutils/instance.hpp b/rpcs3/Emu/RSX/VK/vkutils/instance.hpp
index 61e2f107c7..19ae72f9e0 100644
--- a/rpcs3/Emu/RSX/VK/vkutils/instance.hpp
+++ b/rpcs3/Emu/RSX/VK/vkutils/instance.hpp
@@ -328,7 +328,7 @@ namespace vk
 				}
 				else
 #endif
-#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+#ifdef HAVE_WAYLAND
 					if constexpr (std::is_same_v<T, std::pair<wl_display*, wl_surface*>>)
 					{
 						VkWaylandSurfaceCreateInfoKHR createInfo = {};
diff --git a/rpcs3/rpcs3qt/gs_frame.cpp b/rpcs3/rpcs3qt/gs_frame.cpp
index e5faf27543..c172b11d12 100644
--- a/rpcs3/rpcs3qt/gs_frame.cpp
+++ b/rpcs3/rpcs3qt/gs_frame.cpp
@@ -35,7 +35,7 @@
 #elif defined(__APPLE__)
 //nothing
 #else
-#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+#ifdef HAVE_WAYLAND
 #include <QGuiApplication>
 #include <qpa/qplatformnativeinterface.h>
 #endif
@@ -712,7 +712,7 @@ display_handle_t gs_frame::handle() const
 #elif defined(__APPLE__)
 	return reinterpret_cast<void*>(this->winId()); //NSView
 #else
-#ifdef VK_USE_PLATFORM_WAYLAND_KHR
+#ifdef HAVE_WAYLAND
 	QPlatformNativeInterface *native = QGuiApplication::platformNativeInterface();
 	struct wl_display *wl_dpy = static_cast<struct wl_display *>(
 		native->nativeResourceForWindow("display", NULL));
@@ -723,16 +723,14 @@ display_handle_t gs_frame::handle() const
 		return std::make_pair(wl_dpy, wl_surf);
 	}
 	else
-	{
 #endif
 #ifdef HAVE_X11
+	{
 		return std::make_pair(XOpenDisplay(0), static_cast<ulong>(this->winId()));
+	}
 #else
 		fmt::throw_exception("Vulkan X11 support disabled at compile-time.");
 #endif
-#ifdef VK_USE_PLATFORM_WAYLAND_KHR
-	}
-#endif
 #endif
 }