dolphin-emu/dolphin
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2024-12-02 15:46:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

MoltenVK: Use an external project instead of a pre-compiled dylib

Browse Source 
Also, update MoltenVK to match Vulkan SDK 1.2.189.
This commit is contained in:
OatmealDome 2021-07-31 19:14:22 -04:00
parent 3e84279919
commit 2209dc0355
6 changed files with 30 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -573,6 +573,10 @@ add_subdirectory(Externals/glslang)
if(ENABLE_VULKAN)
add_definitions(-DHAS_VULKAN)
if(APPLE)
add_subdirectory(Externals/MoltenVK)
endif()
endif()
if(NOT WIN32 OR (NOT (CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")))

18
Externals/MoltenVK/CMakeLists.txt vendored Normal file
View File

@ -0,0 +1,18 @@
include(ExternalProject)
ExternalProject_Add(MoltenVK
GIT_REPOSITORY https://github.com/KhronosGroup/MoltenVK.git
GIT_TAG v1.1.5
CONFIGURE_COMMAND <SOURCE_DIR>/fetchDependencies --macos
BUILD_COMMAND make -C <SOURCE_DIR> macos
BUILD_IN_SOURCE ON
BUILD_BYPRODUCTS <SOURCE_DIR>/Package/Release/MoltenVK/dylib/macOS/libMoltenVK.dylib
INSTALL_COMMAND ""
LOG_CONFIGURE ON
LOG_BUILD ON
LOG_OUTPUT_ON_FAILURE ON
)

BIN
Externals/MoltenVK/libvulkan.dylib vendored
View File

Binary file not shown.

1
Externals/MoltenVK/version.txt vendored
View File

@ -1 +0,0 @@
MoltenVK from https://vulkan.lunarg.com/sdk/home#mac, version 1.2.170.0

8
Source/Core/DolphinQt/CMakeLists.txt
View File

@ -528,8 +528,12 @@ if(APPLE)
endforeach()
# Copy MoltenVK into the bundle
target_sources(dolphin-emu PRIVATE "${CMAKE_SOURCE_DIR}/Externals/MoltenVK/libvulkan.dylib")
set_source_files_properties("${CMAKE_SOURCE_DIR}/Externals/MoltenVK/libvulkan.dylib" PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks)
if(ENABLE_VULKAN)
add_dependencies(dolphin-emu MoltenVK)
ExternalProject_Get_Property(MoltenVK SOURCE_DIR)
target_sources(dolphin-emu PRIVATE "${SOURCE_DIR}/Package/Release/MoltenVK/dylib/macOS/libMoltenVK.dylib")
set_source_files_properties("${SOURCE_DIR}/Package/Release/MoltenVK/dylib/macOS/libMoltenVK.dylib" PROPERTIES MACOSX_PACKAGE_LOCATION Frameworks GENERATED ON)
endif()
# Update library references to make the bundle portable
include(DolphinPostprocessBundle)

4
Source/Core/VideoBackends/Vulkan/VulkanLoader.cpp
View File

@ -43,8 +43,8 @@ static bool OpenVulkanLibrary()
if (libvulkan_env && s_vulkan_module.Open(libvulkan_env))
return true;
// Use the libvulkan.dylib from the application bundle.
std::string filename = File::GetBundleDirectory() + "/Contents/Frameworks/libvulkan.dylib";
// Use the libMoltenVK.dylib from the application bundle.
std::string filename = File::GetBundleDirectory() + "/Contents/Frameworks/libMoltenVK.dylib";
return s_vulkan_module.Open(filename.c_str());
#else
std::string filename = Common::DynamicLibrary::GetVersionedFilename("vulkan", 1);