meson: Convert volk submodule to a subproject

.gitmodules

@@ -91,9 +91,6 @@
 [submodule "hw/xbox/nv2a/pgraph/vk/thirdparty/VulkanMemoryAllocator"]
 	path = thirdparty/VulkanMemoryAllocator
 	url = https://github.com/GPUOpen-LibrariesAndSDKs/VulkanMemoryAllocator
-[submodule "thirdparty/volk"]
-	path = thirdparty/volk
-	url = https://github.com/zeux/volk
 [submodule "thirdparty/SPIRV-Reflect"]
 	path = thirdparty/SPIRV-Reflect
 	url = https://github.com/KhronosGroup/SPIRV-Reflect

configure

@@ -237,7 +237,7 @@ else
     git_submodules_action="ignore"
 fi
 
-git_submodules="ui/keycodemapdb ui/thirdparty/imgui ui/thirdparty/implot ui/thirdparty/httplib util/xxHash tomlplusplus genconfig hw/xbox/nv2a/pgraph/thirdparty/nv2a_vsh_cpu thirdparty/volk thirdparty/VulkanMemoryAllocator thirdparty/SPIRV-Reflect"
+git_submodules="ui/keycodemapdb ui/thirdparty/imgui ui/thirdparty/implot ui/thirdparty/httplib util/xxHash tomlplusplus genconfig hw/xbox/nv2a/pgraph/thirdparty/nv2a_vsh_cpu thirdparty/VulkanMemoryAllocator thirdparty/SPIRV-Reflect"
 git="git"
 
 # Don't accept a target_list environment variable.

scripts/archive-source.sh

@@ -32,7 +32,7 @@ submodules="$submodules tests/fp/berkeley-softfloat-3 tests/fp/berkeley-testfloa
 # xemu extras
 submodules="$submodules ui/thirdparty/imgui ui/thirdparty/implot ui/thirdparty/httplib util/xxHash tomlplusplus genconfig"
 submodules="$submodules hw/xbox/nv2a/pgraph/thirdparty/nv2a_vsh_cpu"
-submodules="$submodules thirdparty/volk thirdparty/VulkanMemoryAllocator thirdparty/SPIRV-Reflect"
+submodules="$submodules thirdparty/VulkanMemoryAllocator thirdparty/SPIRV-Reflect"
 
 sub_deinit=""
 

subprojects/volk.wrap

@@ -0,0 +1,4 @@
+[wrap-git]
+url=https://github.com/zeux/volk
+revision=1.3.295
+depth=1

thirdparty/meson.build

@@ -1,7 +1,12 @@
 if vulkan.found()
 
-libvolk = static_library('volk', sources: 'volk/volk.c', c_args: ['-DVK_NO_PROTOTYPES'], dependencies: vulkan)
-volk = declare_dependency(compile_args: ['-DVK_NO_PROTOTYPES'], include_directories: 'volk', link_with: libvolk, dependencies: vulkan)
+volk_opts = cmake.subproject_options()
+volk_opts.add_cmake_defines({'VOLK_STATIC_DEFINES': 'VK_NO_PROTOTYPES'})
+volk_subproj = cmake.subproject('volk', options: volk_opts)
+volk = declare_dependency(compile_args: ['-DVK_NO_PROTOTYPES'],
+                          include_directories: volk_subproj.include_directories('volk'),
+                          link_with: volk_subproj.target('volk'),
+                          dependencies: vulkan)
 
 debug_vma = false
 

thirdparty/volk

@@ -1 +0,0 @@
-Subproject commit 466085407d5d2f50583fd663c1d65f93a7709d3e