From 37dcc7d21ebd6bd6f69bdd6b2a4dc09df43e6581 Mon Sep 17 00:00:00 2001 From: Supakorn 'Jamie' Rassameemasmuang Date: Wed, 14 Feb 2024 21:09:25 -0700 Subject: [PATCH] CXX: Add #undef NDEBUG to all vulkan includes. --- include/vk.h | 4 ++++ include/vkutils.h | 6 +++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/include/vk.h b/include/vk.h index 475c6c394..8144a5e57 100644 --- a/include/vk.h +++ b/include/vk.h @@ -8,6 +8,10 @@ #if defined(HAVE_VULKAN) +// We undefined NDEBUG for common.h, but some files +// do not use common.h, causing includes +// to be a mix of NDEBUG-ed vulkan header and those without +#undef NDEBUG #define VK_ENABLE_BETA_EXTENSIONS #if defined(_WIN32) diff --git a/include/vkutils.h b/include/vkutils.h index ce3ba756e..7e205b354 100644 --- a/include/vkutils.h +++ b/include/vkutils.h @@ -2,6 +2,10 @@ #if defined(HAVE_VULKAN) +// We undefined NDEBUG for common.h, but some files +// do not use common.h, causing includes +// to be a mix of NDEBUG-ed vulkan header and those without +#undef NDEBUG #include namespace camp @@ -15,4 +19,4 @@ void checkVkResult(vk::Result const& result); } } -#endif \ No newline at end of file +#endif