From 467d3e37ee2b54fc735bf85286018505d3783335 Mon Sep 17 00:00:00 2001 From: Tobias Frisch <tfrisch@uni-koblenz.de> Date: Mon, 9 May 2022 23:06:59 +0200 Subject: [PATCH] Updated VMA to use newest official hpp version Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de> --- lib/VulkanMemoryAllocator-Hpp | 2 +- src/vkcv/Context.cpp | 13 ++----------- 2 files changed, 3 insertions(+), 12 deletions(-) diff --git a/lib/VulkanMemoryAllocator-Hpp b/lib/VulkanMemoryAllocator-Hpp index c6c3c665..da6ea76e 160000 --- a/lib/VulkanMemoryAllocator-Hpp +++ b/lib/VulkanMemoryAllocator-Hpp @@ -1 +1 @@ -Subproject commit c6c3c665b6a29ae546bdec60606a3ef0757ea108 +Subproject commit da6ea76eecf12a1decc76f58a3e096bcc555bd94 diff --git a/src/vkcv/Context.cpp b/src/vkcv/Context.cpp index f7cd67eb..8988e479 100644 --- a/src/vkcv/Context.cpp +++ b/src/vkcv/Context.cpp @@ -341,25 +341,16 @@ namespace vkcv vma::AllocatorCreateFlags vmaFlags; const vma::AllocatorCreateInfo allocatorCreateInfo ( - vma::AllocatorCreateFlags(), + vmaFlags, physicalDevice, device, 0, nullptr, nullptr, - 0, - nullptr, 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 + VK_HEADER_VERSION_COMPLETE ); vma::Allocator allocator = vma::createAllocator(allocatorCreateInfo); -- GitLab