diff --git a/config/lib/VulkanMemoryAllocator.cmake b/config/lib/VulkanMemoryAllocator.cmake index c918bd2933ba1c6c88338f7921b75a4233501bbc..fc116ce2457b1b3d805f228c654911c16e62fe70 100644 --- a/config/lib/VulkanMemoryAllocator.cmake +++ b/config/lib/VulkanMemoryAllocator.cmake @@ -1,6 +1,5 @@ -if ((EXISTS "${vkcv_lib_path}/VulkanMemoryAllocator") AND - (EXISTS "${vkcv_lib_path}/VulkanMemoryAllocator-Hpp")) +if (EXISTS "${vkcv_lib_path}/VulkanMemoryAllocator-Hpp") set(VMA_HPP_PATH "${vkcv_lib_path}/VulkanMemoryAllocator-Hpp" CACHE INTERNAL "") set(VMA_RECORDING_ENABLED OFF CACHE INTERNAL "") diff --git a/lib/VulkanMemoryAllocator b/lib/VulkanMemoryAllocator deleted file mode 160000 index 55868965ae1fa956c07695d4642e1add8c9450f7..0000000000000000000000000000000000000000 --- a/lib/VulkanMemoryAllocator +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 55868965ae1fa956c07695d4642e1add8c9450f7 diff --git a/src/vkcv/Context.cpp b/src/vkcv/Context.cpp index 431d53b76b17f2e72c6975bc38cf6395ef65bb24..84cdd587a58c4dcbe48f94caaad2993804cb4db5 100644 --- a/src/vkcv/Context.cpp +++ b/src/vkcv/Context.cpp @@ -320,7 +320,7 @@ namespace vkcv nullptr, nullptr, instance, - VK_HEADER_VERSION_COMPLETE + 0 ); vma::Allocator allocator = vma::createAllocator(allocatorCreateInfo); diff --git a/vma/vma.cpp b/vma/vma.cpp index 0b92d5b609273abdde288883b91b9f74241e8089..0928b552c10e23914054c44b8de43df722aa2cf0 100644 --- a/vma/vma.cpp +++ b/vma/vma.cpp @@ -1,3 +1,7 @@ +#ifndef NDEBUG +#define _DEBUG +#endif + #define VMA_IMPLEMENTATION #include "vk_mem_alloc.hpp"