Link Here
|
1 |
--- include/vulkan/vulkan.hpp.orig 2020-09-21 09:26:07 UTC |
1 |
--- include/vulkan/vulkan.hpp.orig 2020-12-07 12:15:47 UTC |
2 |
+++ include/vulkan/vulkan.hpp |
2 |
+++ include/vulkan/vulkan.hpp |
3 |
@@ -66,7 +66,7 @@ |
3 |
@@ -67,7 +67,7 @@ |
4 |
#endif |
4 |
#endif |
5 |
|
5 |
|
6 |
#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1 |
6 |
#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1 |
Link Here
|
9 |
# include <dlfcn.h> |
9 |
# include <dlfcn.h> |
10 |
# elif defined( _WIN32 ) |
10 |
# elif defined( _WIN32 ) |
11 |
typedef struct HINSTANCE__ * HINSTANCE; |
11 |
typedef struct HINSTANCE__ * HINSTANCE; |
12 |
@@ -90062,7 +90062,7 @@ namespace VULKAN_HPP_NAMESPACE |
12 |
@@ -92754,7 +92754,7 @@ namespace VULKAN_HPP_NAMESPACE |
13 |
{ |
13 |
{ |
14 |
if ( !vulkanLibraryName.empty() ) |
14 |
if ( !vulkanLibraryName.empty() ) |
15 |
{ |
15 |
{ |
Link Here
|
18 |
m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL ); |
18 |
m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL ); |
19 |
# elif defined( _WIN32 ) |
19 |
# elif defined( _WIN32 ) |
20 |
m_library = ::LoadLibraryA( vulkanLibraryName.c_str() ); |
20 |
m_library = ::LoadLibraryA( vulkanLibraryName.c_str() ); |
21 |
@@ -90072,7 +90072,7 @@ namespace VULKAN_HPP_NAMESPACE |
21 |
@@ -92764,7 +92764,7 @@ namespace VULKAN_HPP_NAMESPACE |
22 |
} |
22 |
} |
23 |
else |
23 |
else |
24 |
{ |
24 |
{ |
Link Here
|
27 |
m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL ); |
27 |
m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL ); |
28 |
if ( m_library == nullptr ) |
28 |
if ( m_library == nullptr ) |
29 |
{ |
29 |
{ |
30 |
@@ -90119,7 +90119,7 @@ namespace VULKAN_HPP_NAMESPACE |
30 |
@@ -92807,7 +92807,7 @@ namespace VULKAN_HPP_NAMESPACE |
31 |
{ |
31 |
{ |
32 |
if ( m_library ) |
32 |
if ( m_library ) |
33 |
{ |
33 |
{ |
Link Here
|
36 |
dlclose( m_library ); |
36 |
dlclose( m_library ); |
37 |
# elif defined( _WIN32 ) |
37 |
# elif defined( _WIN32 ) |
38 |
::FreeLibrary( m_library ); |
38 |
::FreeLibrary( m_library ); |
39 |
@@ -90132,7 +90132,7 @@ namespace VULKAN_HPP_NAMESPACE |
39 |
@@ -92820,7 +92820,7 @@ namespace VULKAN_HPP_NAMESPACE |
40 |
template <typename T> |
40 |
template <typename T> |
41 |
T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT |
41 |
T getProcAddress( const char* function ) const VULKAN_HPP_NOEXCEPT |
42 |
{ |
42 |
{ |
Link Here
|
45 |
return (T)dlsym( m_library, function ); |
45 |
return (T)dlsym( m_library, function ); |
46 |
# elif defined( _WIN32 ) |
46 |
# elif defined( _WIN32 ) |
47 |
return (T)::GetProcAddress( m_library, function ); |
47 |
return (T)::GetProcAddress( m_library, function ); |
48 |
@@ -90145,7 +90145,7 @@ namespace VULKAN_HPP_NAMESPACE |
48 |
@@ -92832,7 +92832,7 @@ namespace VULKAN_HPP_NAMESPACE |
|
|
49 |
bool success() const VULKAN_HPP_NOEXCEPT { return m_library != nullptr; } |
49 |
|
50 |
|
50 |
private: |
51 |
private: |
51 |
bool m_success; |
|
|
52 |
-# if defined( __linux__ ) || defined( __APPLE__ ) |
52 |
-# if defined( __linux__ ) || defined( __APPLE__ ) |
53 |
+# if defined( __unix__ ) || defined( __APPLE__ ) |
53 |
+# if defined( __unix__ ) || defined( __APPLE__ ) |
54 |
void * m_library; |
54 |
void * m_library; |