ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

meson: Convert SPIRV-Reflect submodule to a subproject

This commit is contained in:
Matt Borgerson 2024-12-30 18:54:57 -07:00 committed by mborgerson
parent c54964a44a
commit 615748fe4b
7 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitmodules vendored
View File

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

2
configure vendored
View File

@ -237,7 +237,7 @@ else
git_submodules_action="ignore" git_submodules_action="ignore"
fi 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/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"
git="git" git="git"
# Don't accept a target_list environment variable. # Don't accept a target_list environment variable.

2
scripts/archive-source.sh
View File

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

2
scripts/gen-license.py
View File

@ -254,7 +254,7 @@ Lib('VulkanMemoryAllocator', 'https://github.com/GPUOpen-LibrariesAndSDKs/Vulkan
Lib('SPIRV-Reflect', 'https://github.com/KhronosGroup/SPIRV-Reflect', Lib('SPIRV-Reflect', 'https://github.com/KhronosGroup/SPIRV-Reflect',
apache2, 'https://raw.githubusercontent.com/KhronosGroup/SPIRV-Reflect/main/LICENSE', apache2, 'https://raw.githubusercontent.com/KhronosGroup/SPIRV-Reflect/main/LICENSE',
ships_static=all_platforms, ships_static=all_platforms,
submodule=Submodule('thirdparty/SPIRV-Reflect') submodule=Submodule('subprojects/SPIRV-Reflect.wrap')
), ),
# #

4
subprojects/SPIRV-Reflect.wrap Normal file
View File

@ -0,0 +1,4 @@
[wrap-git]
url=https://github.com/KhronosGroup/SPIRV-Reflect
revision=vulkan-sdk-1.3.296.0
depth=1

1
thirdparty/SPIRV-Reflect vendored

@ -1 +0,0 @@
Subproject commit 1d674a82d7e102ed0c02e64e036827db9e8b1a71

8
thirdparty/meson.build vendored
View File

@ -25,7 +25,11 @@ endif
libvma = static_library('vma', sources: 'vma.cc', cpp_args: vma_defns, include_directories: 'VulkanMemoryAllocator/include', dependencies: [vulkan, volk]) libvma = static_library('vma', sources: 'vma.cc', cpp_args: vma_defns, include_directories: 'VulkanMemoryAllocator/include', dependencies: [vulkan, volk])
vma = declare_dependency(compile_args: vma_defns, include_directories: 'VulkanMemoryAllocator/include', link_with: libvma) vma = declare_dependency(compile_args: vma_defns, include_directories: 'VulkanMemoryAllocator/include', link_with: libvma)
libspirv_reflect = static_library('spirv_reflect', sources: 'SPIRV-Reflect/spirv_reflect.c', dependencies: vulkan) spirv_reflect_opts = cmake.subproject_options()
spirv_reflect = declare_dependency(include_directories: 'SPIRV-Reflect', link_with: libspirv_reflect, dependencies: vulkan) spirv_reflect_opts.add_cmake_defines({'SPIRV_REFLECT_STATIC_LIB': 'ON'})
spirv_reflect_subproj = cmake.subproject('SPIRV-Reflect', options: spirv_reflect_opts)
spirv_reflect = declare_dependency(include_directories: spirv_reflect_subproj.include_directories('spirv-reflect-static'),
link_with: spirv_reflect_subproj.target('spirv-reflect-static'),
dependencies: vulkan)
endif endif