From dd3fb9a6736ccf49a02f66295d41737dc29f3a03 Mon Sep 17 00:00:00 2001
From: Tobias Frisch <tfrisch@uni-koblenz.de>
Date: Fri, 9 Jul 2021 21:39:09 +0200
Subject: [PATCH] [#59] Fixed VMA to work
Signed-off-by: Tobias Frisch <tfrisch@uni-koblenz.de>
---
config/lib/VulkanMemoryAllocator.cmake | 3 +--
lib/VulkanMemoryAllocator | 1 -
src/vkcv/Context.cpp | 2 +-
vma/vma.cpp | 4 ++++
4 files changed, 6 insertions(+), 4 deletions(-)
delete mode 160000 lib/VulkanMemoryAllocator
diff --git a/config/lib/VulkanMemoryAllocator.cmake b/config/lib/VulkanMemoryAllocator.cmake
index c918bd29..fc116ce2 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 55868965..00000000
--- a/lib/VulkanMemoryAllocator
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 55868965ae1fa956c07695d4642e1add8c9450f7
diff --git a/src/vkcv/Context.cpp b/src/vkcv/Context.cpp
index 431d53b7..84cdd587 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 0b92d5b6..0928b552 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"
--
GitLab