VERY experimental Nintendo Switch 2 emulator
C++
vulkan: Use newer VK_EXT_metal_surface to create surface for MoltenVK.
Steveice1019a0345f6913
diff --git a/src/video_core/vulkan_common/vulkan_instance.cpp b/src/video_core/vulkan_common/vulkan_instance.cppindex 7624a9b324..6a294c1dad 100644--- a/src/video_core/vulkan_common/vulkan_instance.cpp+++ b/src/video_core/vulkan_common/vulkan_instance.cpp@@ -19,11 +19,9 @@#include <windows.h>// ensure include order#include <vulkan/vulkan_win32.h>-#elif defined(__APPLE__)-#include <vulkan/vulkan_macos.h>#elif defined(__ANDROID__)#include <vulkan/vulkan_android.h>-#else+#elif !defined(__APPLE__)#include <X11/Xlib.h>#include <vulkan/vulkan_wayland.h>#include <vulkan/vulkan_xlib.h>@@ -68,7 +66,7 @@ namespace {break;#elif defined(__APPLE__)case Core::Frontend::WindowSystemType::Cocoa:- extensions.push_back(VK_MVK_MACOS_SURFACE_EXTENSION_NAME);+ extensions.push_back(VK_EXT_METAL_SURFACE_EXTENSION_NAME);break;#elif defined(__ANDROID__)case Core::Frontend::WindowSystemType::Android:diff --git a/src/video_core/vulkan_common/vulkan_surface.cpp b/src/video_core/vulkan_common/vulkan_surface.cppindex c34599365f..cfea4cd7bd 100644--- a/src/video_core/vulkan_common/vulkan_surface.cpp+++ b/src/video_core/vulkan_common/vulkan_surface.cpp@@ -11,11 +11,9 @@#include <windows.h>// ensure include order#include <vulkan/vulkan_win32.h>-#elif defined(__APPLE__)-#include <vulkan/vulkan_macos.h>#elif defined(__ANDROID__)#include <vulkan/vulkan_android.h>-#else+#elif !defined(__APPLE__)#include <X11/Xlib.h>#include <vulkan/vulkan_wayland.h>#include <vulkan/vulkan_xlib.h>@@ -44,12 +42,13 @@ vk::SurfaceKHR CreateSurface(}#elif defined(__APPLE__)if (window_info.type == Core::Frontend::WindowSystemType::Cocoa) {- const VkMacOSSurfaceCreateInfoMVK mvk_ci{VK_STRUCTURE_TYPE_MACOS_SURFACE_CREATE_INFO_MVK,- nullptr, 0, window_info.render_surface};- const auto vkCreateMacOSSurfaceMVK = reinterpret_cast<PFN_vkCreateMacOSSurfaceMVK>(- dld.vkGetInstanceProcAddr(*instance, "vkCreateMacOSSurfaceMVK"));- if (!vkCreateMacOSSurfaceMVK ||- vkCreateMacOSSurfaceMVK(*instance, &mvk_ci, nullptr, &unsafe_surface) != VK_SUCCESS) {+ const VkMetalSurfaceCreateInfoEXT macos_ci = {+ .pLayer = static_cast<const CAMetalLayer*>(window_info.render_surface),+ };+ const auto vkCreateMetalSurfaceEXT = reinterpret_cast<PFN_vkCreateMetalSurfaceEXT>(+ dld.vkGetInstanceProcAddr(*instance, "vkCreateMetalSurfaceEXT"));+ if (!vkCreateMetalSurfaceEXT ||+ vkCreateMetalSurfaceEXT(*instance, &macos_ci, nullptr, &unsafe_surface) != VK_SUCCESS) {LOG_ERROR(Render_Vulkan, "Failed to initialize Metal surface");throw vk::Exception(VK_ERROR_INITIALIZATION_FAILED);}diff --git a/src/video_core/vulkan_common/vulkan_wrapper.h b/src/video_core/vulkan_common/vulkan_wrapper.hindex b5e70fcd46..32bd75ad81 100644--- a/src/video_core/vulkan_common/vulkan_wrapper.h+++ b/src/video_core/vulkan_common/vulkan_wrapper.h@@ -15,6 +15,8 @@#define VK_NO_PROTOTYPES#ifdef _WIN32#define VK_USE_PLATFORM_WIN32_KHR+#elif defined(__APPLE__)+#define VK_USE_PLATFORM_METAL_EXT#endif#include <vulkan/vulkan.h>diff --git a/src/yuzu/qt_common.cpp b/src/yuzu/qt_common.cppindex 5d0fd7674a..413402165c 100644--- a/src/yuzu/qt_common.cpp+++ b/src/yuzu/qt_common.cpp@@ -10,6 +10,8 @@#if !defined(WIN32) && !defined(__APPLE__)#include <qpa/qplatformnativeinterface.h>+#elif defined(__APPLE__)+#include <objc/message.h>#endifnamespace QtCommon {@@ -37,9 +39,12 @@ Core::Frontend::EmuWindow::WindowSystemInfo GetWindowSystemInfo(QWindow* window)Core::Frontend::EmuWindow::WindowSystemInfo wsi;wsi.type = GetWindowSystemType();+#if defined(WIN32)// Our Win32 Qt external doesn't have the private API.-#if defined(WIN32) || defined(__APPLE__)- wsi.render_surface = window ? reinterpret_cast<void*>(window->winId()) : nullptr;+ wsi.render_surface = reinterpret_cast<void*>(window->winId());+#elif defined(__APPLE__)+ wsi.render_surface = reinterpret_cast<void* (*)(id, SEL)>(objc_msgSend)(+ reinterpret_cast<id>(window->winId()), sel_registerName("layer"));#elseQPlatformNativeInterface* pni = QGuiApplication::platformNativeInterface();wsi.display_connection = pni->nativeResourceForWindow("display", window);