Update to Vulkan 1.1.81. #undef major, minor and MemoryBarrier due to namespace conflicts. Those macros are deprecated and should not be used anymore. (#234)
This commit is contained in:
committed by
Andreas Süßenbach
parent
1c06eb7ac0
commit
7d264c7c10
Submodule Vulkan-Docs updated: 831e2d4525...6377124f37
@@ -5162,6 +5162,23 @@ int main( int argc, char **argv )
|
|||||||
# include <cassert>
|
# include <cassert>
|
||||||
# define VULKAN_HPP_ASSERT assert
|
# define VULKAN_HPP_ASSERT assert
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
// <tuple> includes <sys/sysmacros.h> through some other header
|
||||||
|
// this results in major(x) being resolved to gnu_dev_major(x)
|
||||||
|
// which is an expression in a constructor initializer list.
|
||||||
|
#if defined(major)
|
||||||
|
#undef major
|
||||||
|
#endif
|
||||||
|
#if defined(minor)
|
||||||
|
#undef minor
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// Windows defines MemoryBarrier which is deprecated and collides
|
||||||
|
// with the vk::MemoryBarrier struct.
|
||||||
|
#ifdef MemoryBarrier
|
||||||
|
#undef MemoryBarrier
|
||||||
|
#endif
|
||||||
|
|
||||||
)";
|
)";
|
||||||
|
|
||||||
writeVersionCheck(ofs, generator.getVersion());
|
writeVersionCheck(ofs, generator.getVersion());
|
||||||
|
|||||||
1285
vulkan/vulkan.hpp
1285
vulkan/vulkan.hpp
File diff suppressed because it is too large
Load Diff
Reference in New Issue
Block a user