lizzie
4 weeks ago
committed by
Caio Oliveira
No known key found for this signature in database
GPG Key ID: 362DA3DC1901E080
3 changed files with
7 additions and
4 deletions
-
src/video_core/vulkan_common/vulkan.h
-
src/video_core/vulkan_common/vulkan_instance.cpp
-
src/video_core/vulkan_common/vulkan_surface.cpp
|
|
|
@ -22,6 +22,10 @@ |
|
|
|
|
|
|
|
#include <vulkan/vulkan.h> |
|
|
|
|
|
|
|
#ifndef VK_MVK_MACOS_SURFACE_EXTENSION_NAME |
|
|
|
# define VK_MVK_MACOS_SURFACE_EXTENSION_NAME "VK_MVK_macos_surface" |
|
|
|
#endif |
|
|
|
|
|
|
|
// Sanitize macros |
|
|
|
#undef CreateEvent |
|
|
|
#undef CreateSemaphore |
|
|
|
|
|
|
|
@ -54,6 +54,8 @@ namespace { |
|
|
|
#elif defined(__APPLE__)
|
|
|
|
case Core::Frontend::WindowSystemType::Cocoa: |
|
|
|
extensions.push_back(VK_EXT_METAL_SURFACE_EXTENSION_NAME); |
|
|
|
extensions.push_back(VK_MVK_MACOS_SURFACE_EXTENSION_NAME); |
|
|
|
//extensions.push_back(VK_MVK_MOLTENVK_EXTENSION_NAME);
|
|
|
|
break; |
|
|
|
#elif defined(__ANDROID__)
|
|
|
|
case Core::Frontend::WindowSystemType::Android: |
|
|
|
|
|
|
|
@ -40,8 +40,7 @@ vk::SurfaceKHR CreateSurface( |
|
|
|
}; |
|
|
|
const auto vkCreateMetalSurfaceEXT = reinterpret_cast<PFN_vkCreateMetalSurfaceEXT>(dld.vkGetInstanceProcAddr(*instance, "vkCreateMetalSurfaceEXT")); |
|
|
|
if (!vkCreateMetalSurfaceEXT || vkCreateMetalSurfaceEXT(*instance, &metal_ci, nullptr, &unsafe_surface) != VK_SUCCESS) { |
|
|
|
// TODO: Way to fallback? - where's my vulkan headers
|
|
|
|
#if 0
|
|
|
|
// TODO: Way to fallback? - where's my vulkan headers
|
|
|
|
// Attempt to make a macOS surface instead then...
|
|
|
|
// This is the deprecated VkMacOSSurfaceCreateInfoMVK(3) version; but should work if the above failed
|
|
|
|
// https://registry.khronos.org/vulkan/specs/latest/man/html/VkMacOSSurfaceCreateInfoMVK.html
|
|
|
|
@ -56,9 +55,7 @@ vk::SurfaceKHR CreateSurface( |
|
|
|
LOG_ERROR(Render_Vulkan, "Failed to initialize Metal/macOS surface"); |
|
|
|
throw vk::Exception(VK_ERROR_INITIALIZATION_FAILED); |
|
|
|
} |
|
|
|
#endif
|
|
|
|
LOG_ERROR(Render_Vulkan, "Failed to initialize Metal/macOS surface"); |
|
|
|
throw vk::Exception(VK_ERROR_INITIALIZATION_FAILED); |
|
|
|
} |
|
|
|
} |
|
|
|
#elif defined(__ANDROID__)
|
|
|
|
|