mirror of
https://github.com/KhronosGroup/Vulkan-Hpp
synced 2024-11-09 14:10:07 +00:00
Switch __QNXNTO__ macro check to __QNX__ (#1646)
During last 23 years the QNX Neutrino microkernel was active, __QNXNTO__ macro belongs to it. Now QNX Muon microkernel is under development, so __QNX__ macro covers both versions: Neutrino and Muon. First public announce of QNX Muon was here: https://blogs.blackberry.com/en/2023/04/get-in-the-sdv-podcast-from-blackberry-season-2-episode-3
This commit is contained in:
parent
23606b20f7
commit
f51dac9f18
@ -10,7 +10,7 @@
|
||||
{
|
||||
if ( !vulkanLibraryName.empty() )
|
||||
{
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined(__Fuchsia__)
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined(__Fuchsia__)
|
||||
m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL );
|
||||
# elif defined( _WIN32 )
|
||||
m_library = ::LoadLibraryA( vulkanLibraryName.c_str() );
|
||||
@ -20,7 +20,7 @@
|
||||
}
|
||||
else
|
||||
{
|
||||
# if defined( __unix__ ) || defined( __QNXNTO__ ) || defined(__Fuchsia__)
|
||||
# if defined( __unix__ ) || defined( __QNX__ ) || defined(__Fuchsia__)
|
||||
m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
|
||||
if ( m_library == nullptr )
|
||||
{
|
||||
@ -63,7 +63,7 @@
|
||||
{
|
||||
if ( m_library )
|
||||
{
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined(__Fuchsia__)
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined(__Fuchsia__)
|
||||
dlclose( m_library );
|
||||
# elif defined( _WIN32 )
|
||||
::FreeLibrary( m_library );
|
||||
@ -76,7 +76,7 @@
|
||||
template <typename T>
|
||||
T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT
|
||||
{
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined(__Fuchsia__)
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined(__Fuchsia__)
|
||||
return (T)dlsym( m_library, function );
|
||||
# elif defined( _WIN32 )
|
||||
return (T)::GetProcAddress( m_library, function );
|
||||
@ -88,7 +88,7 @@
|
||||
bool success() const VULKAN_HPP_NOEXCEPT { return m_library != nullptr; }
|
||||
|
||||
private:
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined(__Fuchsia__)
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined(__Fuchsia__)
|
||||
void * m_library;
|
||||
# elif defined( _WIN32 )
|
||||
::HINSTANCE m_library;
|
||||
|
@ -76,7 +76,7 @@
|
||||
#endif
|
||||
|
||||
#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined(__Fuchsia__)
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined(__Fuchsia__)
|
||||
# include <dlfcn.h>
|
||||
# elif defined( _WIN32 )
|
||||
typedef struct HINSTANCE__ * HINSTANCE;
|
||||
|
@ -83,7 +83,7 @@
|
||||
#endif
|
||||
|
||||
#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
||||
# include <dlfcn.h>
|
||||
# elif defined( _WIN32 )
|
||||
typedef struct HINSTANCE__ * HINSTANCE;
|
||||
@ -14323,7 +14323,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
{
|
||||
if ( !vulkanLibraryName.empty() )
|
||||
{
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
||||
m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL );
|
||||
# elif defined( _WIN32 )
|
||||
m_library = ::LoadLibraryA( vulkanLibraryName.c_str() );
|
||||
@ -14333,7 +14333,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
}
|
||||
else
|
||||
{
|
||||
# if defined( __unix__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
# if defined( __unix__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
||||
m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
|
||||
if ( m_library == nullptr )
|
||||
{
|
||||
@ -14376,7 +14376,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
{
|
||||
if ( m_library )
|
||||
{
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
||||
dlclose( m_library );
|
||||
# elif defined( _WIN32 )
|
||||
::FreeLibrary( m_library );
|
||||
@ -14389,7 +14389,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
template <typename T>
|
||||
T getProcAddress( const char * function ) const VULKAN_HPP_NOEXCEPT
|
||||
{
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
||||
return (T)dlsym( m_library, function );
|
||||
# elif defined( _WIN32 )
|
||||
return ( T )::GetProcAddress( m_library, function );
|
||||
@ -14404,7 +14404,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
}
|
||||
|
||||
private:
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
||||
void * m_library;
|
||||
# elif defined( _WIN32 )
|
||||
::HINSTANCE m_library;
|
||||
|
@ -83,7 +83,7 @@
|
||||
#endif
|
||||
|
||||
#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
||||
# include <dlfcn.h>
|
||||
# elif defined( _WIN32 )
|
||||
typedef struct HINSTANCE__ * HINSTANCE;
|
||||
@ -7029,7 +7029,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
{
|
||||
if ( !vulkanLibraryName.empty() )
|
||||
{
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
||||
m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL );
|
||||
# elif defined( _WIN32 )
|
||||
m_library = ::LoadLibraryA( vulkanLibraryName.c_str() );
|
||||
@ -7039,7 +7039,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
}
|
||||
else
|
||||
{
|
||||
# if defined( __unix__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
# if defined( __unix__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
||||
m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL );
|
||||
if ( m_library == nullptr )
|
||||
{
|
||||
@ -7082,7 +7082,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
{
|
||||
if ( m_library )
|
||||
{
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
||||
dlclose( m_library );
|
||||
# elif defined( _WIN32 )
|
||||
::FreeLibrary( m_library );
|
||||
@ -7095,7 +7095,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
template <typename T>
|
||||
T getProcAddress( const char * function ) const VULKAN_HPP_NOEXCEPT
|
||||
{
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
||||
return (T)dlsym( m_library, function );
|
||||
# elif defined( _WIN32 )
|
||||
return ( T )::GetProcAddress( m_library, function );
|
||||
@ -7110,7 +7110,7 @@ namespace VULKAN_HPP_NAMESPACE
|
||||
}
|
||||
|
||||
private:
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNXNTO__ ) || defined( __Fuchsia__ )
|
||||
# if defined( __unix__ ) || defined( __APPLE__ ) || defined( __QNX__ ) || defined( __Fuchsia__ )
|
||||
void * m_library;
|
||||
# elif defined( _WIN32 )
|
||||
::HINSTANCE m_library;
|
||||
|
Loading…
Reference in New Issue
Block a user