From ba997f0736a582ed46899f982ec9d1755a69c5e4 Mon Sep 17 00:00:00 2001 From: rochaudhari Date: Thu, 10 Jun 2021 11:38:04 +0530 Subject: [PATCH] vk-headers: Update subprojects/Vulkan-Headers to 1.2.180 This is needed for VK_NVX_binary_import and VK_NVX_image_view_handle. Signed-off-by: Roshan Chaudhari Reviewed-by: Liam Middlebrook --- include/vkd3d_win32.h | 11 +++++++++++ subprojects/Vulkan-Headers | 2 +- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/include/vkd3d_win32.h b/include/vkd3d_win32.h index b721cbb2..27fc9e62 100644 --- a/include/vkd3d_win32.h +++ b/include/vkd3d_win32.h @@ -42,9 +42,20 @@ #define WIDL_C_INLINE_WRAPPERS #include +/* Vulkan headers include static const declarations. Enable static keyword for + * them. + */ +#ifdef __MINGW32__ +# undef static +#endif + #define VK_USE_PLATFORM_WIN32_KHR #include +#ifdef __MINGW32__ +# define static +#endif + #include /* We already included regular DXGI... diff --git a/subprojects/Vulkan-Headers b/subprojects/Vulkan-Headers index fe985076..07c4a37b 160000 --- a/subprojects/Vulkan-Headers +++ b/subprojects/Vulkan-Headers @@ -1 +1 @@ -Subproject commit fe9850767d00e46b230da6cfbc15eb86636017bd +Subproject commit 07c4a37bcf41ea50aef6e98236abdfe8089fb4c6