diff options
| author | Jon Leech <[email protected]> | 2019-10-21 02:37:33 -0700 |
|---|---|---|
| committer | Jon Leech <[email protected]> | 2019-10-21 02:38:11 -0700 |
| commit | 6be1d00866a6d3bf8a1839b902d1de9e7065a4b8 (patch) | |
| tree | 5b35a349767366a950d807e56a97403342859788 /include/vulkan | |
| parent | d287523f48dba1b669866c5d6625b29931948e39 (diff) | |
| download | Vulkan-Headers-6be1d00866a6d3bf8a1839b902d1de9e7065a4b8.tar.gz Vulkan-Headers-6be1d00866a6d3bf8a1839b902d1de9e7065a4b8.zip | |
Update for Vulkan-Docs 1.1.126v1.1.126
Diffstat (limited to 'include/vulkan')
| -rw-r--r-- | include/vulkan/vulkan.hpp | 12 | ||||
| -rw-r--r-- | include/vulkan/vulkan_core.h | 2 |
2 files changed, 8 insertions, 6 deletions
diff --git a/include/vulkan/vulkan.hpp b/include/vulkan/vulkan.hpp index 6623538..8ee12a2 100644 --- a/include/vulkan/vulkan.hpp +++ b/include/vulkan/vulkan.hpp @@ -56,11 +56,11 @@ # define VULKAN_HPP_ASSERT assert #endif -#if defined(__linux__) +#if defined(__linux__) || defined(__APPLE__) # include <dlfcn.h> #endif -static_assert( VK_HEADER_VERSION == 125 , "Wrong VK_HEADER_VERSION!" ); +static_assert( VK_HEADER_VERSION == 126 , "Wrong VK_HEADER_VERSION!" ); // 32-bit vulkan is not typesafe for handles, so don't allow copy constructors on this platform by default. // To enable this feature on 32-bit platforms please define VULKAN_HPP_TYPESAFE_CONVERSION @@ -73795,6 +73795,8 @@ namespace VULKAN_HPP_NAMESPACE { #if defined(__linux__) m_library = dlopen( "libvulkan.so", RTLD_NOW | RTLD_LOCAL ); +#elif defined(__APPLE__) + m_library = dlopen( "libvulkan.dylib", RTLD_NOW | RTLD_LOCAL ); #elif defined(_WIN32) m_library = LoadLibrary( "vulkan-1.dll" ); #else @@ -73815,7 +73817,7 @@ namespace VULKAN_HPP_NAMESPACE { if ( m_library ) { -#if defined(__linux__) +#if defined(__linux__) || defined(__APPLE__) dlclose( m_library ); #elif defined(_WIN32) FreeLibrary( m_library ); @@ -73826,7 +73828,7 @@ namespace VULKAN_HPP_NAMESPACE template <typename T> T getProcAddress( const char* function ) const { -#if defined(__linux__) +#if defined(__linux__) || defined(__APPLE__) return (T)dlsym( m_library, function ); #elif defined(_WIN32) return (T)GetProcAddress( m_library, function ); @@ -73837,7 +73839,7 @@ namespace VULKAN_HPP_NAMESPACE private: bool m_success; -#if defined(__linux__) +#if defined(__linux__) || defined(__APPLE__) void *m_library; #elif defined(_WIN32) HMODULE m_library; diff --git a/include/vulkan/vulkan_core.h b/include/vulkan/vulkan_core.h index 9770c3b..ea929a9 100644 --- a/include/vulkan/vulkan_core.h +++ b/include/vulkan/vulkan_core.h @@ -44,7 +44,7 @@ extern "C" { #define VK_VERSION_MINOR(version) (((uint32_t)(version) >> 12) & 0x3ff) #define VK_VERSION_PATCH(version) ((uint32_t)(version) & 0xfff) // Version of this file -#define VK_HEADER_VERSION 125 +#define VK_HEADER_VERSION 126 #define VK_NULL_HANDLE 0 |