diff --git a/config/lib/VulkanMemoryAllocator.cmake b/config/lib/VulkanMemoryAllocator.cmake index fc116ce2457b1b3d805f228c654911c16e62fe70..5f670ff04633e1747accb8f1598fee028a287168 100644 --- a/config/lib/VulkanMemoryAllocator.cmake +++ b/config/lib/VulkanMemoryAllocator.cmake @@ -11,7 +11,7 @@ if (EXISTS "${vkcv_lib_path}/VulkanMemoryAllocator-Hpp") set(VMA_DEBUG_GLOBAL_MUTEX OFF CACHE INTERNAL "") set(VMA_DEBUG_DONT_EXCEED_MAX_MEMORY_ALLOCATION_COUNT OFF CACHE INTERNAL "") - add_subdirectory(vma) + add_subdirectory(${vkcv_config_lib}/vma) list(APPEND vkcv_libraries VulkanMemoryAllocator) list(APPEND vkcv_includes ${vkcv_lib_path}/VulkanMemoryAllocator-Hpp) diff --git a/vma/CMakeLists.txt b/config/lib/vma/CMakeLists.txt similarity index 100% rename from vma/CMakeLists.txt rename to config/lib/vma/CMakeLists.txt diff --git a/vma/vma.cpp b/config/lib/vma/vma.cpp similarity index 100% rename from vma/vma.cpp rename to config/lib/vma/vma.cpp diff --git a/src/vkcv/Context.cpp b/src/vkcv/Context.cpp index 84cdd587a58c4dcbe48f94caaad2993804cb4db5..5db50869498600fa8e926c0feff2cb5fda1eb22e 100644 --- a/src/vkcv/Context.cpp +++ b/src/vkcv/Context.cpp @@ -320,6 +320,13 @@ namespace vkcv nullptr, nullptr, instance, + + /* Uses default version when set to 0 (currently VK_VERSION_1_0): + * + * The reason for this is that the allocator restricts the allowed version + * to be at maximum VK_VERSION_1_1 which is already less than + * VK_HEADER_VERSION_COMPLETE at most platforms. + * */ 0 );