From 3a74fecb227f60266d8363e432717da7a324ce8f Mon Sep 17 00:00:00 2001
From: niki <nikeinikei98@gmail.com>
Date: Fri, 16 Sep 2022 02:25:36 +0200
Subject: [PATCH] vulkan: outsource used libraries

---
 CMakeLists.txt                                | 23 +++++++++++++++----
 .../vulkan => libraries/vma}/vk_mem_alloc.h   |  0
 .../vulkan => libraries/volk}/volk.cpp        |  0
 .../graphics/vulkan => libraries/volk}/volk.h |  0
 src/modules/graphics/vulkan/Graphics.cpp      |  2 ++
 src/modules/graphics/vulkan/UseVMA.cpp        |  4 ----
 src/modules/graphics/vulkan/VulkanWrapper.h   |  4 ++--
 7 files changed, 23 insertions(+), 10 deletions(-)
 rename src/{modules/graphics/vulkan => libraries/vma}/vk_mem_alloc.h (100%)
 rename src/{modules/graphics/vulkan => libraries/volk}/volk.cpp (100%)
 rename src/{modules/graphics/vulkan => libraries/volk}/volk.h (100%)
 delete mode 100644 src/modules/graphics/vulkan/UseVMA.cpp

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c984e8c2..a1eac2c68 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -611,10 +611,6 @@ set(LOVE_SRC_MODULE_GRAPHICS_VULKAN
 	src/modules/graphics/vulkan/Texture.cpp
 	src/modules/graphics/vulkan/Vulkan.h
 	src/modules/graphics/vulkan/Vulkan.cpp
-	src/modules/graphics/vulkan/volk.h
-	src/modules/graphics/vulkan/volk.cpp
-	src/modules/graphics/vulkan/vk_mem_alloc.h
-	src/modules/graphics/vulkan/UseVMA.cpp
 	src/modules/graphics/vulkan/VulkanWrapper.h)
 
 set(LOVE_SRC_MODULE_GRAPHICS
@@ -1756,6 +1752,24 @@ set(LOVE_SRC_3P_UTF8
 # This library is all headers ... so there is no need to
 # add_library() here.
 
+#
+# vma
+#
+
+set(LOVE_SRC_3P_VMA src/libraries/vma/vk_mem_alloc.h)
+
+# vulkan memory allocatory has no implementation files of its own.
+
+#
+# volk
+#
+
+set(LOVE_SRC_3P_VOLK 
+	src/libraries/volk/volk.h
+	src/libraries/volk/volk.cpp)
+
+add_library(love_3p_volk ${LOVE_SRC_3P_VOLK})
+
 #
 # Wuff
 #
@@ -1798,6 +1812,7 @@ set(LOVE_3P
 	love_3p_noise1234
 	love_3p_physfs
 	love_3p_spirv_cross
+	love_3p_volk
 	love_3p_wuff
 	love_3p_xxhash
 )
diff --git a/src/modules/graphics/vulkan/vk_mem_alloc.h b/src/libraries/vma/vk_mem_alloc.h
similarity index 100%
rename from src/modules/graphics/vulkan/vk_mem_alloc.h
rename to src/libraries/vma/vk_mem_alloc.h
diff --git a/src/modules/graphics/vulkan/volk.cpp b/src/libraries/volk/volk.cpp
similarity index 100%
rename from src/modules/graphics/vulkan/volk.cpp
rename to src/libraries/volk/volk.cpp
diff --git a/src/modules/graphics/vulkan/volk.h b/src/libraries/volk/volk.h
similarity index 100%
rename from src/modules/graphics/vulkan/volk.h
rename to src/libraries/volk/volk.h
diff --git a/src/modules/graphics/vulkan/Graphics.cpp b/src/modules/graphics/vulkan/Graphics.cpp
index 0f79eab11..878ab8386 100644
--- a/src/modules/graphics/vulkan/Graphics.cpp
+++ b/src/modules/graphics/vulkan/Graphics.cpp
@@ -18,6 +18,8 @@
 #include <sstream>
 #include <array>
 
+#define VMA_IMPLEMENTATION
+#include "libraries/vma/vk_mem_alloc.h"
 
 namespace love
 {
diff --git a/src/modules/graphics/vulkan/UseVMA.cpp b/src/modules/graphics/vulkan/UseVMA.cpp
deleted file mode 100644
index ffba789e9..000000000
--- a/src/modules/graphics/vulkan/UseVMA.cpp
+++ /dev/null
@@ -1,4 +0,0 @@
-#include "VulkanWrapper.h"
-
-#define VMA_IMPLEMENTATION
-#include "vk_mem_alloc.h"
diff --git a/src/modules/graphics/vulkan/VulkanWrapper.h b/src/modules/graphics/vulkan/VulkanWrapper.h
index 7e202ece3..745a24697 100644
--- a/src/modules/graphics/vulkan/VulkanWrapper.h
+++ b/src/modules/graphics/vulkan/VulkanWrapper.h
@@ -20,7 +20,7 @@
 #define VK_API_VERSION_PATCH(version) ((uint32_t)(version) & 0xFFFU)
 #endif
 
-#include "volk.h"
+#include "libraries/volk/volk.h"
 #define VMA_STATIC_VULKAN_FUNCTIONS 0
 #define VMA_DYNAMIC_VULKAN_FUNCTIONS 0
-#include "vk_mem_alloc.h"
+#include "libraries/vma/vk_mem_alloc.h"