From d58b9810760ac93eadcab295d51751f729bed784 Mon Sep 17 00:00:00 2001 From: pineappleEA Date: Tue, 6 Dec 2022 05:35:33 +0100 Subject: [PATCH] early-access version 3189 --- CMakeLists.txt | 2 +- README.md | 2 +- src/video_core/vulkan_common/vulkan_device.cpp | 2 ++ src/video_core/vulkan_common/vulkan_wrapper.cpp | 8 +++++++- 4 files changed, 11 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f7d8bc3b7..32c6bddbb 100755 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,7 +214,7 @@ if (ARCHITECTURE_x86 OR ARCHITECTURE_x86_64) endif() if (ARCHITECTURE_x86_64 OR ARCHITECTURE_arm64) - find_package(dynarmic 6.2.4) + find_package(dynarmic 6.4.0) endif() if (ENABLE_CUBEB) diff --git a/README.md b/README.md index fd0cf26d4..79d39dcc5 100755 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ yuzu emulator early access ============= -This is the source code for early-access 3188. +This is the source code for early-access 3189. ## Legal Notice diff --git a/src/video_core/vulkan_common/vulkan_device.cpp b/src/video_core/vulkan_common/vulkan_device.cpp index 911e8889d..5ab55c4d7 100755 --- 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 53128df9e..2f0fe509d 100755 --- 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 buffe Instance Instance::Create(u32 version, Span layers, Span 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 layers, Span