mewin/vulkan-hpp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add some workarounds to not include windows.h on _WIN32 platform.

Browse Source
This commit is contained in:
asuessenbach
2020-05-13 09:06:48 +02:00
parent 0f5a571e88
commit 895c5766bc
2 changed files with 50 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
vulkan/vulkan.hpp
View File

@@ -69,10 +69,6 @@
# if defined( __linux__ ) || defined( __APPLE__ )
# include <dlfcn.h>
# endif
# if defined( _WIN32 )
# include <windows.h>
# endif
#endif
#if 201711 <= __cpp_impl_three_way_comparison
@@ -96704,6 +96700,15 @@ namespace VULKAN_HPP_NAMESPACE
};
#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL
# if defined( _WIN32 )
namespace detail
{
extern "C" __declspec( dllimport ) void * __stdcall LoadLibraryA( char const * lpLibFileName );
extern "C" __declspec( dllimport ) int __stdcall FreeLibrary( void * hLibModule );
extern "C" __declspec( dllimport ) void * __stdcall GetProcAddress( void * hModule, char const * lpProcName );
} // namespace detail
# endif
class DynamicLoader
{
public:
@@ -96718,9 +96723,9 @@ namespace VULKAN_HPP_NAMESPACE
# if defined( __linux__ ) || defined( __APPLE__ )
m_library = dlopen( vulkanLibraryName.c_str(), RTLD_NOW | RTLD_LOCAL );
# elif defined( _WIN32 )
m_library = LoadLibrary( vulkanLibraryName.c_str() );
m_library = detail::LoadLibraryA( vulkanLibraryName.c_str() );
# else
VULKAN_HPP_ASSERT( false && "unsupported platform" );
# error unsupported platform
# endif
}
else
@@ -96734,9 +96739,9 @@ namespace VULKAN_HPP_NAMESPACE
# elif defined( __APPLE__ )
m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL );
# elif defined( _WIN32 )
m_library = LoadLibrary( TEXT( "vulkan-1.dll" ) );
m_library = detail::LoadLibraryA( "vulkan-1.dll" );
# else
VULKAN_HPP_ASSERT( false && "unsupported platform" );
# error unsupported platform
# endif
}
@@ -96776,7 +96781,9 @@ namespace VULKAN_HPP_NAMESPACE
# if defined( __linux__ ) || defined( __APPLE__ )
dlclose( m_library );
# elif defined( _WIN32 )
FreeLibrary( m_library );
detail::FreeLibrary( m_library );
# else
# error unsupported platform
# endif
}
}
@@ -96787,7 +96794,9 @@ namespace VULKAN_HPP_NAMESPACE
# if defined( __linux__ ) || defined( __APPLE__ )
return (T)dlsym( m_library, function );
# elif defined( _WIN32 )
return (T)GetProcAddress( m_library, function );
return (T)detail::GetProcAddress( m_library, function );
# else
# error unsupported platform
# endif
}
@@ -96798,10 +96807,8 @@ namespace VULKAN_HPP_NAMESPACE
private:
bool m_success;
# if defined( __linux__ ) || defined( __APPLE__ )
# if defined( __linux__ ) || defined( __APPLE__ ) || defined( _WIN32 )
void * m_library;
# elif defined( _WIN32 )
HMODULE m_library;
# else
# error unsupported platform
# endif