CCF_100/citra
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

renderer_vulkan: Revert vkGetInstanceProcAddr symbol change for MoltenVK. (#7341)

Browse Source
This commit is contained in:
Steveice10
2024-01-12 09:16:04 -08:00
committed by GitHub
parent 19d5695aa3
commit 37f0a7484f
2 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/video_core/renderer_vulkan/vk_platform.cpp
View File

@@ -283,21 +283,10 @@ vk::UniqueInstance CreateInstance(const Common::DynamicLibrary& library,
throw std::runtime_error("Failed to load Vulkan driver library");
}
auto vkGetInstanceProcAddr =
const auto vkGetInstanceProcAddr =
library.GetSymbol<PFN_vkGetInstanceProcAddr>("vkGetInstanceProcAddr");
if (!vkGetInstanceProcAddr) {
#ifdef __APPLE__
// MoltenVK now hides most Vulkan symbols by default to avoid clashes,
// so we may need to use the ICD hook instead.
vkGetInstanceProcAddr =
library.GetSymbol<PFN_vkGetInstanceProcAddr>("vk_icdGetInstanceProcAddr");
if (!vkGetInstanceProcAddr) {
throw std::runtime_error(
"Failed GetSymbol vkGetInstanceProcAddr or vk_icdGetInstanceProcAddr");
}
#else
throw std::runtime_error("Failed GetSymbol vkGetInstanceProcAddr");
#endif
}
VULKAN_HPP_DEFAULT_DISPATCHER.init(vkGetInstanceProcAddr);