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:
Markus Tavenrath 2018-07-23 17:23:13 +02:00 committed by Andreas Süßenbach
parent 1c06eb7ac0
commit 7d264c7c10
3 changed files with 1036 additions and 268 deletions

@ -1 +1 @@
Subproject commit 831e2d4525cc3231adfadc3bc6b0c8372e6f7f68
Subproject commit 6377124f371f9d8b1d9761b1116fac647222a13d

View File

@ -5162,6 +5162,23 @@ int main( int argc, char **argv )
# include <cassert>
# define VULKAN_HPP_ASSERT assert
#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());

File diff suppressed because it is too large Load Diff