archive/rpcs3
1
0
Fork 0
mirror of https://github.com/RPCS3/rpcs3.git synced 2025-07-02 13:01:27 +12:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

9
rpcs3/Emu/RSX/VK/VulkanAPI.h
View file

@ -6,8 +6,13 @@
#define VK_USE_PLATFORM_MACOS_MVK
#elif defined(ANDROID)
#define VK_USE_PLATFORM_ANDROID_KHR
#elif HAVE_X11
#define VK_USE_PLATFORM_XLIB_KHR
#else
#if defined(HAVE_X11)
#define VK_USE_PLATFORM_XLIB_KHR
#endif
#if defined(HAVE_WAYLAND)
#define VK_USE_PLATFORM_WAYLAND_KHR
#endif
#endif
#ifdef _MSC_VER

4
rpcs3/Emu/RSX/VK/vkutils/instance.cpp
View file

@ -174,14 +174,14 @@ namespace vk
found_surface_ext = true;
}
#endif
#ifdef VK_USE_PLATFORM_WAYLAND_KHR
#ifdef HAVE_WAYLAND
if (support.is_supported(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME))
{
extensions.push_back(VK_KHR_WAYLAND_SURFACE_EXTENSION_NAME);
found_surface_ext = true;
}
#endif //(WAYLAND)
#ifdef VK_USE_PLATFORM_ANDROID_KHR
#ifdef ANDROID
if (support.is_supported(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME))
{
extensions.push_back(VK_KHR_ANDROID_SURFACE_EXTENSION_NAME);

8
rpcs3/Emu/RSX/display.h
View file

@ -11,7 +11,7 @@ using Display = struct _XDisplay;
using Window = unsigned long;
#endif
#ifdef VK_USE_PLATFORM_WAYLAND_KHR
#ifdef HAVE_WAYLAND
#include <wayland-client.h>
#endif
@ -22,14 +22,14 @@ using display_handle_t = void*; // NSView
#else
#include <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*>
#elif defined(HAVE_X11)
std::pair<Display*, Window>
#elif defined(VK_USE_PLATFORM_WAYLAND_KHR)
#elif defined(HAVE_WAYLAND)
std::pair<wl_display*, wl_surface*>
#elif defined(ANDROID)
struct ANativeWindow *
struct ANativeWindow*
#endif
>;
#endif