mirror of
https://github.com/shadps4-emu/shadPS4.git
synced 2025-05-14 08:12:16 +00:00
fix: Make sure right MoltenVK is loaded for macOS SDL.
This commit is contained in:
parent
b1ebb2fec5
commit
ee7fe305c9
1 changed files with 5 additions and 0 deletions
|
@ -223,6 +223,7 @@ vk::UniqueInstance CreateInstance(Frontend::WindowSystemType window_type, bool e
|
||||||
LOG_INFO(Render_Vulkan, "Creating vulkan instance");
|
LOG_INFO(Render_Vulkan, "Creating vulkan instance");
|
||||||
|
|
||||||
#ifdef __APPLE__
|
#ifdef __APPLE__
|
||||||
|
#ifdef ENABLE_QT_GUI
|
||||||
// If the Vulkan loader exists in /usr/local/lib, give it priority. The Vulkan SDK
|
// If the Vulkan loader exists in /usr/local/lib, give it priority. The Vulkan SDK
|
||||||
// installs it here by default but it is not in the default library search path.
|
// installs it here by default but it is not in the default library search path.
|
||||||
// The loader has a clause to check for it, but at a lower priority than the bundled
|
// The loader has a clause to check for it, but at a lower priority than the bundled
|
||||||
|
@ -231,6 +232,10 @@ vk::UniqueInstance CreateInstance(Frontend::WindowSystemType window_type, bool e
|
||||||
static vk::detail::DynamicLoader dl = std::filesystem::exists(usr_local_path)
|
static vk::detail::DynamicLoader dl = std::filesystem::exists(usr_local_path)
|
||||||
? vk::detail::DynamicLoader(usr_local_path)
|
? vk::detail::DynamicLoader(usr_local_path)
|
||||||
: vk::detail::DynamicLoader();
|
: vk::detail::DynamicLoader();
|
||||||
|
#else
|
||||||
|
// TODO: Support layer loading in SDL build. For now just make sure we load the right MoltenVK.
|
||||||
|
static vk::detail::DynamicLoader dl("libMoltenVK.dylib");
|
||||||
|
#endif
|
||||||
#else
|
#else
|
||||||
static vk::detail::DynamicLoader dl;
|
static vk::detail::DynamicLoader dl;
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Reference in a new issue