Impaczus/rpcs3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vk: Stop using internal defines to structure platform-specific code

Browse Source
This commit is contained in:
kd-11
2025-04-29 00:29:17 +03:00
committed by kd-11
parent 2aca213ba1
commit 1af67f39ca
3 changed files with 13 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rpcs3/Emu/RSX/VK/VulkanAPI.h
+6 -1
View File
@@ -6,9 +6,14 @@
#define VK_USE_PLATFORM_MACOS_MVK #define VK_USE_PLATFORM_MACOS_MVK
#elif defined(ANDROID) #elif defined(ANDROID)
#define VK_USE_PLATFORM_ANDROID_KHR #define VK_USE_PLATFORM_ANDROID_KHR
#elif HAVE_X11 #else
#if defined(HAVE_X11)
#define VK_USE_PLATFORM_XLIB_KHR #define VK_USE_PLATFORM_XLIB_KHR
#endif #endif
#if defined(HAVE_WAYLAND)
#define VK_USE_PLATFORM_WAYLAND_KHR
#endif
#endif
#ifdef _MSC_VER #ifdef _MSC_VER
#pragma warning( push ) #pragma warning( push )
rpcs3/Emu/RSX/VK/vkutils/instance.cpp
+2 -2
View File
@@ -174,14 +174,14 @@ namespace vk
found_surface_ext = true; found_surface_ext = true;
} }
#endif #endif
#ifdef VK_USE_PLATFORM_WAYLAND_KHR #ifdef HAVE_WAYLAND
if (support.is_supported(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME)) if (support.is_supported(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME))
{ {
extensions.push_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME); extensions.push_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);
found_surface_ext = true; found_surface_ext = true;
} }
#endif //(WAYLAND) #endif //(WAYLAND)
#ifdef VK_USE_PLATFORM_ANDROID_KHR #ifdef ANDROID
if (support.is_supported(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME)) if (support.is_supported(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME))
{ {
extensions.push_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME); extensions.push_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME);
rpcs3/Emu/RSX/display.h
+3 -3
View File
@@ -11,7 +11,7 @@ using Display = struct _XDisplay;
using Window = unsigned long; using Window = unsigned long;
#endif #endif
#ifdef VK_USE_PLATFORM_WAYLAND_KHR #ifdef HAVE_WAYLAND
#include <wayland-client.h> #include <wayland-client.h>
#endif #endif
@@ -22,11 +22,11 @@ using display_handle_t = void*; // NSView
#else #else
#include <variant> #include <variant>
using display_handle_t = std::variant< using display_handle_t = std::variant<
#if defined(HAVE_X11) && defined(VK_USE_PLATFORM_WAYLAND_KHR) #if defined(HAVE_X11) && defined(HAVE_WAYLAND)
std::pair<Display*, Window>, std::pair<wl_display*, wl_surface*> std::pair<Display*, Window>, std::pair<wl_display*, wl_surface*>
#elif defined(HAVE_X11) #elif defined(HAVE_X11)
std::pair<Display*, Window> std::pair<Display*, Window>
#elif defined(VK_USE_PLATFORM_WAYLAND_KHR) #elif defined(HAVE_WAYLAND)
std::pair<wl_display*, wl_surface*> std::pair<wl_display*, wl_surface*>
#elif defined(ANDROID) #elif defined(ANDROID)
struct ANativeWindow* struct ANativeWindow*