mirror/Vulkan-Hpp
1
0
Fork 0
mirror of https://github.com/KhronosGroup/Vulkan-Hpp.git synced 2024-10-14 16:32:17 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

build: Add MacOS Specific Code to DynamicLoader (#409)

Browse Source 
Added MacOS specific code to the DynamicLoader class.
vkCubepp in KhronosGroup/Vulkan-Tools requires this change to
build on MacOS.
This commit is contained in:
jeremyk-lunarg 2019-10-17 01:59:35 -06:00 committed by Markus Tavenrath
parent f379a11a69
commit 65af859e4d
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
VulkanHppGenerator.cpp
View File

@ -1048,6 +1048,8 @@ void VulkanHppGenerator::appendDispatchLoaderDynamic(std::string & str)
{ {
#if defined(__linux__) #if defined(__linux__)
m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL ); m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
#elif defined(__APPLE__)
m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL );
#elif defined(_WIN32) #elif defined(_WIN32)
m_library = LoadLibrary( "vulkan-1.dll" ); m_library = LoadLibrary( "vulkan-1.dll" );
#else #else
@ -1068,7 +1070,7 @@ void VulkanHppGenerator::appendDispatchLoaderDynamic(std::string & str)
{ {
if ( m_library ) if ( m_library )
{ {
#if defined(__linux__) #if defined(__linux__) || defined(__APPLE__)
dlclose( m_library ); dlclose( m_library );
#elif defined(_WIN32) #elif defined(_WIN32)
FreeLibrary( m_library ); FreeLibrary( m_library );
@ -1079,7 +1081,7 @@ void VulkanHppGenerator::appendDispatchLoaderDynamic(std::string & str)
template <typename T> template <typename T>
T getProcAddress( const char* function ) const T getProcAddress( const char* function ) const
{ {
#if defined(__linux__) #if defined(__linux__) || defined(__APPLE__)
return (T)dlsym( m_library, function ); return (T)dlsym( m_library, function );
#elif defined(_WIN32) #elif defined(_WIN32)
return (T)GetProcAddress( m_library, function ); return (T)GetProcAddress( m_library, function );
@ -1090,7 +1092,7 @@ void VulkanHppGenerator::appendDispatchLoaderDynamic(std::string & str)
private: private:
bool m_success; bool m_success;
#if defined(__linux__) #if defined(__linux__) || defined(__APPLE__)
void *m_library; void *m_library;
#elif defined(_WIN32) #elif defined(_WIN32)
HMODULE m_library; HMODULE m_library;
@ -5147,7 +5149,7 @@ static const std::string constExpressionArrayCopy = R"(
# define VULKAN_HPP_ASSERT assert # define VULKAN_HPP_ASSERT assert
#endif #endif
#if defined(__linux__) #if defined(__linux__) || defined(__APPLE__)
# include <dlfcn.h> # include <dlfcn.h>
#endif #endif
)"; )";