move volk, vulkan header to CPM

K1ngst0m · Jan 29, 2024 · 6331262 · 6331262
1 parent ecb477b
commit 6331262
Showing 70 changed files with 19 additions and 387,451 deletions.
diff --git a/cmake/AphExternal.cmake b/cmake/AphExternal.cmake
@@ -1,5 +1,7 @@
 include(CPM)
 
+set(VK_SDK_VERSION 1.3.275)
+
 CPMAddPackage(
   NAME tinygltf
   GITHUB_REPOSITORY syoyo/tinygltf
@@ -56,13 +58,26 @@ CPMAddPackage(
 CPMAddPackage(
   NAME spirv-cross
   GITHUB_REPOSITORY KhronosGroup/SPIRV-Cross
-  GIT_TAG vulkan-sdk-1.3.268
+  GIT_TAG vulkan-sdk-${VK_SDK_VERSION}
   OPTIONS
       "SPIRV_CROSS_CLI OFF"
       "SPIRV_CROSS_ENABLE_TESTS ON"
 )
 
-add_subdirectory(${APH_EXTERNAL_DIR}/volk EXCLUDE_FROM_ALL)
+CPMAddPackage(
+  NAME vulkan-headers
+  GITHUB_REPOSITORY KhronosGroup/Vulkan-Headers
+  GIT_TAG vulkan-sdk-${VK_SDK_VERSION}
+  DOWNLOAD_ONLY YES
+)
+
+CPMAddPackage(
+  NAME volk
+  GITHUB_REPOSITORY zeux/volk
+  GIT_TAG vulkan-sdk-${VK_SDK_VERSION}
+  DOWNLOAD_ONLY YES
+)
+
 add_subdirectory(${APH_EXTERNAL_DIR}/imgui EXCLUDE_FROM_ALL)
 
 # wsi backend

diff --git a/engine/api/CMakeLists.txt b/engine/api/CMakeLists.txt
@@ -8,11 +8,11 @@ target_include_directories(api PRIVATE
 
 target_include_directories(api SYSTEM
   PRIVATE
-  ${APH_EXTERNAL_DIR}/vulkan
+  ${vulkan-headers_SOURCE_DIR}/include
   ${spirv-cross_SOURCE_DIR}
   ${vma_SOURCE_DIR}/include
   PUBLIC
-  ${APH_EXTERNAL_DIR}/volk
+  ${volk_SOURCE_DIR}
   )
 
 target_link_libraries(api PRIVATE

diff --git a/external/volk/CMakeLists.txt b/external/volk/CMakeLists.txt
diff --git a/external/volk/LICENSE.md b/external/volk/LICENSE.md
diff --git a/external/volk/volk.c b/external/volk/volk.c
diff --git a/external/volk/volk.h b/external/volk/volk.h
diff --git a/external/vulkan/cast_utils.h b/external/vulkan/cast_utils.h
diff --git a/external/vulkan/hash_util.h b/external/vulkan/hash_util.h
diff --git a/external/vulkan/hash_vk_types.h b/external/vulkan/hash_vk_types.h
diff --git a/external/vulkan/vk_dispatch_table_helper.h b/external/vulkan/vk_dispatch_table_helper.h
diff --git a/external/vulkan/vk_enum_string_helper.h b/external/vulkan/vk_enum_string_helper.h
diff --git a/external/vulkan/vk_extension_helper.h b/external/vulkan/vk_extension_helper.h
diff --git a/external/vulkan/vk_format_utils.cpp b/external/vulkan/vk_format_utils.cpp
diff --git a/external/vulkan/vk_format_utils.h b/external/vulkan/vk_format_utils.h
diff --git a/external/vulkan/vk_icd.h b/external/vulkan/vk_icd.h
diff --git a/external/vulkan/vk_layer.h b/external/vulkan/vk_layer.h
diff --git a/external/vulkan/vk_layer_config.cpp b/external/vulkan/vk_layer_config.cpp
diff --git a/external/vulkan/vk_layer_config.h b/external/vulkan/vk_layer_config.h
diff --git a/external/vulkan/vk_layer_data.h b/external/vulkan/vk_layer_data.h
diff --git a/external/vulkan/vk_layer_dispatch_table.h b/external/vulkan/vk_layer_dispatch_table.h
diff --git a/external/vulkan/vk_layer_extension_utils.cpp b/external/vulkan/vk_layer_extension_utils.cpp
diff --git a/external/vulkan/vk_layer_extension_utils.h b/external/vulkan/vk_layer_extension_utils.h
diff --git a/external/vulkan/vk_layer_logging.cpp b/external/vulkan/vk_layer_logging.cpp
diff --git a/external/vulkan/vk_layer_logging.h b/external/vulkan/vk_layer_logging.h
diff --git a/external/vulkan/vk_layer_utils.cpp b/external/vulkan/vk_layer_utils.cpp
diff --git a/external/vulkan/vk_layer_utils.h b/external/vulkan/vk_layer_utils.h
diff --git a/external/vulkan/vk_object_types.h b/external/vulkan/vk_object_types.h
diff --git a/external/vulkan/vk_platform.h b/external/vulkan/vk_platform.h
diff --git a/external/vulkan/vk_safe_struct.cpp b/external/vulkan/vk_safe_struct.cpp
diff --git a/external/vulkan/vk_safe_struct.h b/external/vulkan/vk_safe_struct.h
diff --git a/external/vulkan/vk_sdk_platform.h b/external/vulkan/vk_sdk_platform.h
diff --git a/external/vulkan/vk_typemap_helper.h b/external/vulkan/vk_typemap_helper.h
diff --git a/external/vulkan/vk_validation_error_messages.h b/external/vulkan/vk_validation_error_messages.h
diff --git a/external/vulkan/vk_video/vulkan_video_codec_h264std.h b/external/vulkan/vk_video/vulkan_video_codec_h264std.h
diff --git a/external/vulkan/vk_video/vulkan_video_codec_h264std_decode.h b/external/vulkan/vk_video/vulkan_video_codec_h264std_decode.h
diff --git a/external/vulkan/vk_video/vulkan_video_codec_h264std_encode.h b/external/vulkan/vk_video/vulkan_video_codec_h264std_encode.h