Skip to content

Commit b5ee615

Browse files
fix: Win32 name collision
1 parent 904e8f0 commit b5ee615

2 files changed

Lines changed: 21 additions & 0 deletions

File tree

framework/generated/generated_vulkan_decoder_args.h

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,15 @@
5252

5353
#include <tuple>
5454

55+
#ifdef WIN32
56+
#ifdef CreateEvent
57+
#undef CreateEvent
58+
#endif
59+
#ifdef CreateSemaphore
60+
#undef CreateSemaphore
61+
#endif
62+
#endif
63+
5564
GFXRECON_BEGIN_NAMESPACE(gfxrecon)
5665
GFXRECON_BEGIN_NAMESPACE(decode)
5766
GFXRECON_BEGIN_NAMESPACE(args)

framework/generated/khronos_generators/vulkan_generators/vulkan_decoder_args_header_generator.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,18 @@ def __init__(
6969
self.begin_end_file_data.system_headers.append('tuple')
7070
self.begin_end_file_data.namespaces.extend(('gfxrecon', 'decode', 'args'))
7171

72+
self.begin_end_file_data.pre_namespace_code.extend((
73+
'#ifdef WIN32',
74+
'#ifdef CreateEvent',
75+
'#undef CreateEvent',
76+
'#endif',
77+
'#ifdef CreateSemaphore',
78+
'#undef CreateSemaphore',
79+
'#endif',
80+
'#endif',
81+
''
82+
))
83+
7284
class VulkanDecoderArgsHeaderGenerator(
7385
KhronosStructDecodersHeaderGenerator, VulkanBaseGenerator
7486
):

0 commit comments

Comments
 (0)