sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

VulkanRenderer/Loader: Try to load other vulkan libs

This commit is contained in:
SirLynix 2023-08-16 18:12:26 +02:00
parent f2fc02cbd4
commit 49adcd7b81
1 changed files with 57 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/Nazara/VulkanRenderer/Wrapper/Loader.cpp
View File

@ -64,28 +64,41 @@ namespace Nz
bool Loader::Initialize() bool Loader::Initialize()
{ {
#ifdef NAZARA_PLATFORM_WINDOWS #if defined(NAZARA_PLATFORM_WINDOWS)
s_vulkanLib.Load("vulkan-1.dll"); std::array libs{
#elif defined(NAZARA_PLATFORM_LINUX) "vulkan-1.dll"
s_vulkanLib.Load("libvulkan.so"); };
#elif defined(NAZARA_PLATFORM_MACOS) #elif defined(NAZARA_PLATFORM_LINUX) || defined(NAZARA_PLATFORM_ANDROID)
s_vulkanLib.Load("libMoltenVK.dylib"); std::array libs{
"libvulkan.so.1",
"libvulkan.so"
};
#elif defined(NAZARA_PLATFORM_MACOS) || defined(NAZARA_PLATFORM_IOS)
std::array libs{
"libvulkan.dylib",
"libvulkan.1.dylib",
"libMoltenVK.dylib",
};
#else #else
#error Unhandled platform NazaraError("unhandled OS");
return false;
#endif #endif
if (!s_vulkanLib.IsLoaded()) for (const char* libname : libs)
{ {
NazaraError("failed to open vulkan library: {0}", s_vulkanLib.GetLastError()); ErrorFlags errorFlags(ErrorMode::Silent, ~ErrorMode::ThrowException);
return false;
} if (!s_vulkanLib.Load(libname))
continue;
Error::ApplyFlags({}, ~ErrorMode::Silent);
// vkGetInstanceProcAddr is the only function that's guarantee to be exported // vkGetInstanceProcAddr is the only function that's guarantee to be exported
vkGetInstanceProcAddr = reinterpret_cast<PFN_vkGetInstanceProcAddr>(s_vulkanLib.GetSymbol("vkGetInstanceProcAddr")); vkGetInstanceProcAddr = reinterpret_cast<PFN_vkGetInstanceProcAddr>(s_vulkanLib.GetSymbol("vkGetInstanceProcAddr"));
if (!vkGetInstanceProcAddr) if (!vkGetInstanceProcAddr)
{ {
NazaraError("Failed to get symbol \"vkGetInstanceProcAddr\": {0}", s_vulkanLib.GetLastError()); NazaraError("Failed to get symbol \"vkGetInstanceProcAddr\": {0}", s_vulkanLib.GetLastError());
return false; continue;
} }
auto GetProcAddr = [&](const char* name, bool opt) auto GetProcAddr = [&](const char* name, bool opt)
@ -107,13 +120,19 @@ namespace Nz
#define NAZARA_VULKANRENDERER_GLOBAL_FUNCTION_OPT(func) func = reinterpret_cast<PFN_##func>(GetProcAddr(#func, true)); #define NAZARA_VULKANRENDERER_GLOBAL_FUNCTION_OPT(func) func = reinterpret_cast<PFN_##func>(GetProcAddr(#func, true));
#include <Nazara/VulkanRenderer/Wrapper/GlobalFunctions.hpp> #include <Nazara/VulkanRenderer/Wrapper/GlobalFunctions.hpp>
} }
catch (const std::exception& e) catch (const std::exception& e)
{ {
NazaraError("Failed to query device function: {0}", e.what()); NazaraError("Failed to query device function: {0}", e.what());
return false; return false;
} }
}
if (!s_vulkanLib.IsLoaded())
{
NazaraError("failed to open vulkan library");
return false;
}
s_lastErrorCode = VkResult::VK_SUCCESS; s_lastErrorCode = VkResult::VK_SUCCESS;