diff options
| author | Connor McLaughlin <stenzek@gmail.com> | 2020-04-08 00:30:40 +1000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-04-08 00:30:40 +1000 |
| commit | 960ba4fe5e243056c3ef8a71f5298dc48722d29c (patch) | |
| tree | 1c26191fd452ff8dd74a9cb230e912cd8861fb9d /Source/Core/VideoBackends/Vulkan/main.cpp | |
| parent | 4ff855921e221f944d5ce22074e86096474d4ea6 (diff) | |
| parent | a2f4fafe86b8407ecbe1228257ab993fd2c1b815 (diff) | |
Merge pull request #8728 from stenzek/update-mvk
Vulkan: Switch from vkCreateMacOSSurfaceMVK() to vkCreateMetalSurfaceEXT() and Update MoltenVK
Diffstat (limited to 'Source/Core/VideoBackends/Vulkan/main.cpp')
| -rw-r--r-- | Source/Core/VideoBackends/Vulkan/main.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/Core/VideoBackends/Vulkan/main.cpp b/Source/Core/VideoBackends/Vulkan/main.cpp index 4d6b1296ac..5a583de124 100644 --- a/Source/Core/VideoBackends/Vulkan/main.cpp +++ b/Source/Core/VideoBackends/Vulkan/main.cpp @@ -23,7 +23,7 @@ #include "VideoCommon/VideoBackendBase.h" #include "VideoCommon/VideoConfig.h" -#if defined(VK_USE_PLATFORM_MACOS_MVK) +#if defined(VK_USE_PLATFORM_METAL_EXT) #include <objc/message.h> #endif @@ -280,7 +280,7 @@ void VideoBackend::Shutdown() UnloadVulkanLibrary(); } -#if defined(VK_USE_PLATFORM_MACOS_MVK) +#if defined(VK_USE_PLATFORM_METAL_EXT) static bool IsRunningOnMojaveOrHigher() { // id processInfo = [NSProcessInfo processInfo] @@ -306,7 +306,7 @@ static bool IsRunningOnMojaveOrHigher() void VideoBackend::PrepareWindow(WindowSystemInfo& wsi) { -#if defined(VK_USE_PLATFORM_MACOS_MVK) +#if defined(VK_USE_PLATFORM_METAL_EXT) // This is kinda messy, but it avoids having to write Objective C++ just to create a metal layer. id view = reinterpret_cast<id>(wsi.render_surface); Class clsCAMetalLayer = objc_getClass("CAMetalLayer"); |