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

Include windows.h on windows platforms in case the DynamicLoader is enabled. (#431)

Browse Source
This commit is contained in:
Markus Tavenrath 2019-11-11 17:23:35 +01:00 committed by Andreas Süßenbach
parent 581b7cb227
commit 661d2a9a7c
2 changed files with 25 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
VulkanHppGenerator.cpp
View File

@ -1040,10 +1040,6 @@ void VulkanHppGenerator::appendCommand(std::string & str, std::string const& ind
void VulkanHppGenerator::appendDispatchLoaderDynamic(std::string & str) void VulkanHppGenerator::appendDispatchLoaderDynamic(std::string & str)
{ {
str += R"( str += R"(
#if !defined(VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL)
# define VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL 1
#endif
#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL
class DynamicLoader class DynamicLoader
{ {
@ -5127,9 +5123,20 @@ static const std::string constExpressionArrayCopy = R"(
# define VULKAN_HPP_ASSERT assert # define VULKAN_HPP_ASSERT assert
#endif #endif
#if defined(__linux__) || defined(__APPLE__) #if !defined(VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL)
# include <dlfcn.h> # define VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL 1
#endif #endif
#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
# if defined(__linux__) || defined(__APPLE__)
# include <dlfcn.h>
# endif
# if defined(_WIN32)
# include <windows.h>
# endif
#endif
)"; )";
static const std::string is_error_code_enum = R"( static const std::string is_error_code_enum = R"(

16
vulkan/vulkan.hpp
View File

@ -56,8 +56,18 @@
# define VULKAN_HPP_ASSERT assert # define VULKAN_HPP_ASSERT assert
#endif #endif
#if defined(__linux__) || defined(__APPLE__) #if !defined(VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL)
# define VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL 1
#endif
#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL == 1
# if defined(__linux__) || defined(__APPLE__)
# include <dlfcn.h> # include <dlfcn.h>
# endif
# if defined(_WIN32)
# include <windows.h>
# endif
#endif #endif
static_assert( VK_HEADER_VERSION == 126 , "Wrong VK_HEADER_VERSION!" ); static_assert( VK_HEADER_VERSION == 126 , "Wrong VK_HEADER_VERSION!" );
@ -66834,10 +66844,6 @@ namespace VULKAN_HPP_NAMESPACE
template <> struct isStructureChainValid<WriteDescriptorSet, WriteDescriptorSetAccelerationStructureNV>{ enum { value = true }; }; template <> struct isStructureChainValid<WriteDescriptorSet, WriteDescriptorSetAccelerationStructureNV>{ enum { value = true }; };
template <> struct isStructureChainValid<WriteDescriptorSet, WriteDescriptorSetInlineUniformBlockEXT>{ enum { value = true }; }; template <> struct isStructureChainValid<WriteDescriptorSet, WriteDescriptorSetInlineUniformBlockEXT>{ enum { value = true }; };
#if !defined(VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL)
# define VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL 1
#endif
#if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL #if VULKAN_HPP_ENABLE_DYNAMIC_LOADER_TOOL
class DynamicLoader class DynamicLoader
{ {