mirror of
https://github.com/godotengine/godot.git
synced 2024-12-27 11:24:59 +08:00
728dbeab69
Updates to volk, vulkan headers, `vk_enum_string_helper.h`, VMA, glslang, spirv-reflect. VMA doesn't tag SDK releases specifically, and still hasn't had a tagged release since 3.0.1, but the Vulkan SDK now seems to ship a recent master commit, so we do the same.
18 lines
468 B
Diff
18 lines
468 B
Diff
diff --git a/thirdparty/vulkan/vk_mem_alloc.h b/thirdparty/vulkan/vk_mem_alloc.h
|
|
index fa4298b23c..a29bf6dfb6 100644
|
|
--- a/thirdparty/vulkan/vk_mem_alloc.h
|
|
+++ b/thirdparty/vulkan/vk_mem_alloc.h
|
|
@@ -126,7 +126,11 @@ See documentation chapter: \ref statistics.
|
|
extern "C" {
|
|
#endif
|
|
|
|
-#include <vulkan/vulkan.h>
|
|
+#ifdef USE_VOLK
|
|
+ #include <volk.h>
|
|
+#else
|
|
+ #include <vulkan/vulkan.h>
|
|
+#endif
|
|
|
|
#if !defined(VMA_VULKAN_VERSION)
|
|
#if defined(VK_VERSION_1_3)
|