Skip to content

Commit 478dff3

Browse files
Dv-Sennasezero
authored andcommitted
SDL_vulkan.h: undefine VK_DEFINE_HANDLER and VK_DEFINE_NON_DISPATCHABLE_HANDLE
Allows including vulkan.hpp in user code in C++ before SDL_vulkan.h w/o errors. Fixes: #11328 . (cherry picked from commit 149ecff)
1 parent 5b0e838 commit 478dff3

File tree

1 file changed

+4
-0
lines changed

1 file changed

+4
-0
lines changed

include/SDL_vulkan.h

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,10 @@ extern "C" {
5252
VK_DEFINE_HANDLE(VkInstance)
5353
VK_DEFINE_NON_DISPATCHABLE_HANDLE(VkSurfaceKHR)
5454

55+
/* Make sure to undef to avoid issues in case of later vulkan include */
56+
#undef VK_DEFINE_HANDLE
57+
#undef VK_DEFINE_NON_DISPATCHABLE_HANDLE
58+
5559
#endif /* !NO_SDL_VULKAN_TYPEDEFS */
5660

5761
typedef VkInstance SDL_vulkanInstance;

0 commit comments

Comments
 (0)