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

Extend DynamicLoader loading policy

Browse Source
This commit is contained in:
asuessenbach 2020-05-12 13:21:50 +02:00
parent 542d9c3f0b
commit f79f43498e
2 changed files with 60 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
VulkanHppGenerator.cpp
View File

@ -1407,23 +1407,40 @@ void VulkanHppGenerator::appendDispatchLoaderDynamic( std::string & str )
class DynamicLoader class DynamicLoader
{ {
public: public:
#ifdef VULKAN_HPP_NO_EXCEPTIONS # ifdef VULKAN_HPP_NO_EXCEPTIONS
DynamicLoader() VULKAN_HPP_NOEXCEPT : m_success( false ) DynamicLoader( std::string const & vulkanLibraryName = {} ) VULKAN_HPP_NOEXCEPT : m_success( false )
#else # else
DynamicLoader() : m_success( false ) DynamicLoader( std::string const & vulkanLibraryName = {} ) : m_success( false )
#endif # endif
{ {
#if defined(__linux__) if ( !vulkanLibraryName.empty() )
m_library = dlopen( "libvulkan.so.1", RTLD_NOW | RTLD_LOCAL ); {
#elif defined(__APPLE__) # if defined( __linux__ ) || defined( __APPLE__ )
m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL ); m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL );
#elif defined(_WIN32) # elif defined( _WIN32 )
m_library = LoadLibrary( TEXT( "vulkan-1.dll" ) ); m_library = LoadLibrary( vulkanLibraryName.c_str() );
#else # else
VULKAN_HPP_ASSERT( false && "unsupported platform" ); VULKAN_HPP_ASSERT( false && "unsupported platform" );
#endif # endif
}
else
{
# if defined( __linux__ )
m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
if ( m_library == nullptr )
{
m_library = dlopen( "libvulkan.so.1", RTLD_NOW | RTLD_LOCAL );
}
# elif defined( __APPLE__ )
m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL );
# elif defined( _WIN32 )
m_library = LoadLibrary( TEXT( "vulkan-1.dll" ) );
# else
VULKAN_HPP_ASSERT( false && "unsupported platform" );
# endif
}
m_success = m_library != 0; m_success = (m_library != nullptr);
#ifndef VULKAN_HPP_NO_EXCEPTIONS #ifndef VULKAN_HPP_NO_EXCEPTIONS
if ( !m_success ) if ( !m_success )
{ {
@ -4216,8 +4233,8 @@ void VulkanHppGenerator::checkCorrectness()
for ( auto const & require : extension.second.requirements ) for ( auto const & require : extension.second.requirements )
{ {
warn( m_extensions.find( require.first ) != m_extensions.end(), warn( m_extensions.find( require.first ) != m_extensions.end(),
require.second, require.second,
"unknown extension requires <" + require.first + ">" ); "unknown extension requires <" + require.first + ">" );
} }
} }
for ( auto const & funcPointer : m_funcPointers ) for ( auto const & funcPointer : m_funcPointers )

35
vulkan/vulkan.hpp
View File

@ -96708,22 +96708,39 @@ namespace VULKAN_HPP_NAMESPACE
{ {
public: public:
# ifdef VULKAN_HPP_NO_EXCEPTIONS # ifdef VULKAN_HPP_NO_EXCEPTIONS
DynamicLoader() VULKAN_HPP_NOEXCEPT : m_success( false ) DynamicLoader( std::string const & vulkanLibraryName = {} ) VULKAN_HPP_NOEXCEPT : m_success( false )
# else # else
DynamicLoader() : m_success( false ) DynamicLoader( std::string const & vulkanLibraryName = {} ) : m_success( false )
# endif # endif
{ {
# if defined( __linux__ ) if ( !vulkanLibraryName.empty() )
m_library = dlopen( "libvulkan.so.1", RTLD_NOW | RTLD_LOCAL ); {
# elif defined( __APPLE__ ) # if defined( __linux__ ) || defined( __APPLE__ )
m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL ); m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL );
# elif defined( _WIN32 ) # elif defined( _WIN32 )
m_library = LoadLibrary( TEXT( "vulkan-1.dll" ) ); m_library = LoadLibrary( vulkanLibraryName.c_str() );
# else # else
VULKAN_HPP_ASSERT( false && "unsupported platform" ); VULKAN_HPP_ASSERT( false && "unsupported platform" );
# endif # endif
}
else
{
# if defined( __linux__ )
m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
if ( m_library == nullptr )
{
m_library = dlopen( "libvulkan.so.1", RTLD_NOW | RTLD_LOCAL );
}
# elif defined( __APPLE__ )
m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL );
# elif defined( _WIN32 )
m_library = LoadLibrary( TEXT( "vulkan-1.dll" ) );
# else
VULKAN_HPP_ASSERT( false && "unsupported platform" );
# endif
}
m_success = m_library != 0; m_success = ( m_library != nullptr );
# ifndef VULKAN_HPP_NO_EXCEPTIONS # ifndef VULKAN_HPP_NO_EXCEPTIONS
if ( !m_success ) if ( !m_success )
{ {