diff options
| author | Liam <byteslice@airmail.cc> | 2022-12-06 04:06:35 +0100 |
|---|---|---|
| committer | Liam <byteslice@airmail.cc> | 2022-12-06 04:06:35 +0100 |
| commit | 7e7a23363a054970206ccb623bfa1899fa7f4663 (patch) | |
| tree | 70f73dfec4423548f7039d4ebb425435c6b30e8b | |
| parent | Merge pull request #9388 from lioncash/fix-msvc (diff) | |
| download | yuzu-7e7a23363a054970206ccb623bfa1899fa7f4663.tar yuzu-7e7a23363a054970206ccb623bfa1899fa7f4663.tar.gz yuzu-7e7a23363a054970206ccb623bfa1899fa7f4663.tar.bz2 yuzu-7e7a23363a054970206ccb623bfa1899fa7f4663.tar.lz yuzu-7e7a23363a054970206ccb623bfa1899fa7f4663.tar.xz yuzu-7e7a23363a054970206ccb623bfa1899fa7f4663.tar.zst yuzu-7e7a23363a054970206ccb623bfa1899fa7f4663.zip | |
| -rw-r--r-- | src/video_core/vulkan_common/vulkan_device.cpp | 2 | ||||
| -rw-r--r-- | src/video_core/vulkan_common/vulkan_wrapper.cpp | 8 |
2 files changed, 9 insertions, 1 deletions
diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 33856fe59..467878431 100644 --- a/src/video_core/vulkan_common/vulkan_device.cpp +++ b/src/video_core/vulkan_common/vulkan_device.cpp @@ -86,6 +86,8 @@ constexpr std::array REQUIRED_EXTENSIONS{ }; constexpr std::array REQUIRED_EXTENSIONS_BEFORE_1_2{ + VK_KHR_TIMELINE_SEMAPHORE_EXTENSION_NAME, + VK_EXT_HOST_QUERY_RESET_EXTENSION_NAME, VK_KHR_8BIT_STORAGE_EXTENSION_NAME, VK_KHR_SHADER_FLOAT_CONTROLS_EXTENSION_NAME, VK_KHR_SAMPLER_MIRROR_CLAMP_TO_EDGE_EXTENSION_NAME, diff --git a/src/video_core/vulkan_common/vulkan_wrapper.cpp b/src/video_core/vulkan_common/vulkan_wrapper.cpp index e4a07813f..bda10ee2f 100644 --- a/src/video_core/vulkan_common/vulkan_wrapper.cpp +++ b/src/video_core/vulkan_common/vulkan_wrapper.cpp @@ -454,6 +454,12 @@ VkResult Free(VkDevice device, VkCommandPool handle, Span<VkCommandBuffer> buffe Instance Instance::Create(u32 version, Span<const char*> layers, Span<const char*> extensions, InstanceDispatch& dispatch) { +#ifdef __APPLE__ + constexpr VkFlags ci_flags{VK_INSTANCE_CREATE_ENUMERATE_PORTABILITY_BIT_KHR}; +#else + constexpr VkFlags ci_flags{}; +#endif + const VkApplicationInfo application_info{ .sType = VK_STRUCTURE_TYPE_APPLICATION_INFO, .pNext = nullptr, @@ -466,7 +472,7 @@ Instance Instance::Create(u32 version, Span<const char*> layers, Span<const char const VkInstanceCreateInfo ci{ .sType = VK_STRUCTURE_TYPE_INSTANCE_CREATE_INFO, .pNext = nullptr, - .flags = 0, + .flags = ci_flags, .pApplicationInfo = &application_info, .enabledLayerCount = layers.size(), .ppEnabledLayerNames = layers.data(), |