801741e787
This updates VMA and instead of using the custom small pool approach from 4e6c9d3ae9, lazily creates pools for the relevant memory type indices, which doesn't require patching VMA.
Also, patches already merged upstream or not needed any longer are removed.
18 lines
494 B
Diff
18 lines
494 B
Diff
diff --git a/thirdparty/vulkan/vk_mem_alloc.h b/thirdparty/vulkan/vk_mem_alloc.h
|
|
index 52b403bede..7c450be211 100644
|
|
--- a/thirdparty/vulkan/vk_mem_alloc.h
|
|
+++ b/thirdparty/vulkan/vk_mem_alloc.h
|
|
@@ -127,7 +127,11 @@ extern "C" {
|
|
#endif
|
|
|
|
#ifndef VULKAN_H_
|
|
- #include <vulkan/vulkan.h>
|
|
+ #ifdef USE_VOLK
|
|
+ #include <volk.h>
|
|
+ #else
|
|
+ #include <vulkan/vulkan.h>
|
|
+ #endif
|
|
#endif
|
|
|
|
// Define this macro to declare maximum supported Vulkan version in format AAABBBCCC,
|