Browse Source

vulkan: outsource used libraries

niki 2 years ago
parent
commit
3a74fecb22

+ 19 - 4
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
 )

+ 0 - 0
src/modules/graphics/vulkan/vk_mem_alloc.h → src/libraries/vma/vk_mem_alloc.h


+ 0 - 0
src/modules/graphics/vulkan/volk.cpp → src/libraries/volk/volk.cpp


+ 0 - 0
src/modules/graphics/vulkan/volk.h → src/libraries/volk/volk.h


+ 2 - 0
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
 {

+ 0 - 4
src/modules/graphics/vulkan/UseVMA.cpp

@@ -1,4 +0,0 @@
-#include "VulkanWrapper.h"
-
-#define VMA_IMPLEMENTATION
-#include "vk_mem_alloc.h"

+ 2 - 2
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"