From bd39f9a0709c492d05a86df47568c9e482891e31 Mon Sep 17 00:00:00 2001 From: DH Date: Tue, 3 Sep 2024 09:43:58 +0300 Subject: [PATCH] add SPIR-V submodules --- .gitmodules | 12 ++++++++++++ 3rdparty/CMakeLists.txt | 20 ++++++++++++++++++++ 3rdparty/SPIRV-Cross | 1 + 3rdparty/SPIRV-Headers | 1 + 3rdparty/SPIRV-Tools | 1 + 3rdparty/glslang | 1 + CMakeLists.txt | 3 +-- 7 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 3rdparty/CMakeLists.txt create mode 160000 3rdparty/SPIRV-Cross create mode 160000 3rdparty/SPIRV-Headers create mode 160000 3rdparty/SPIRV-Tools create mode 160000 3rdparty/glslang diff --git a/.gitmodules b/.gitmodules index f6d97badb..c999f9cc1 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,15 @@ [submodule "3rdparty/xbyak"] path = 3rdparty/xbyak url = ../../RPCSX/xbyak.git +[submodule "3rdparty/SPIRV-Tools"] + path = 3rdparty/SPIRV-Tools + url = ../../KhronosGroup/SPIRV-Tools.git +[submodule "3rdparty/SPIRV-Headers"] + path = 3rdparty/SPIRV-Headers + url = ../../KhronosGroup/SPIRV-Headers.git +[submodule "3rdparty/SPIRV-Cross"] + path = 3rdparty/SPIRV-Cross + url = ../../KhronosGroup/SPIRV-Cross.git +[submodule "3rdparty/glslang"] + path = 3rdparty/glslang + url = ../../KhronosGroup/glslang.git diff --git a/3rdparty/CMakeLists.txt b/3rdparty/CMakeLists.txt new file mode 100644 index 000000000..8d3d28295 --- /dev/null +++ b/3rdparty/CMakeLists.txt @@ -0,0 +1,20 @@ +add_subdirectory(crypto) +add_subdirectory(xbyak) +add_subdirectory(SPIRV-Headers) +add_subdirectory(SPIRV-Tools) + +set(SPIRV_CROSS_SHARED on) +set(SPIRV_CROSS_STATIC on) +set(SPIRV_CROSS_ENABLE_GLSL on) +set(SPIRV_CROSS_ENABLE_HLSL off) +set(SPIRV_CROSS_ENABLE_MSL off) +set(SPIRV_CROSS_ENABLE_CPP off) +set(SPIRV_CROSS_ENABLE_REFLECT off) +set(SPIRV_CROSS_ENABLE_C_API off) +set(SPIRV_CROSS_ENABLE_UTIL off) +set(SPIRV_CROSS_CLI off) +set(SPIRV_CROSS_ENABLE_TESTS off) +set(SPIRV_CROSS_SKIP_INSTALL on) +add_subdirectory(SPIRV-Cross) + +add_subdirectory(glslang) diff --git a/3rdparty/SPIRV-Cross b/3rdparty/SPIRV-Cross new file mode 160000 index 000000000..6a1fb66ee --- /dev/null +++ b/3rdparty/SPIRV-Cross @@ -0,0 +1 @@ +Subproject commit 6a1fb66eef1bdca14acf7d0a51a3f883499d79f0 diff --git a/3rdparty/SPIRV-Headers b/3rdparty/SPIRV-Headers new file mode 160000 index 000000000..efb6b4099 --- /dev/null +++ b/3rdparty/SPIRV-Headers @@ -0,0 +1 @@ +Subproject commit efb6b4099ddb8fa60f62956dee592c4b94ec6a49 diff --git a/3rdparty/SPIRV-Tools b/3rdparty/SPIRV-Tools new file mode 160000 index 000000000..b21dda0ee --- /dev/null +++ b/3rdparty/SPIRV-Tools @@ -0,0 +1 @@ +Subproject commit b21dda0ee7a3ea4e0192a7b2b09db1df1de9d5e7 diff --git a/3rdparty/glslang b/3rdparty/glslang new file mode 160000 index 000000000..a496a34b4 --- /dev/null +++ b/3rdparty/glslang @@ -0,0 +1 @@ +Subproject commit a496a34b439022750d41d2ba04fbbe416ef81c9a diff --git a/CMakeLists.txt b/CMakeLists.txt index aaf1d22aa..79118dac3 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -5,8 +5,7 @@ set(CMAKE_CXX_EXTENSIONS off) set(CMAKE_CXX_STANDARD 23) set(CMAKE_CXX_STANDARD_REQUIRED ON) -add_subdirectory(3rdparty/crypto EXCLUDE_FROM_ALL) -add_subdirectory(3rdparty/xbyak EXCLUDE_FROM_ALL) +add_subdirectory(3rdparty EXCLUDE_FROM_ALL) add_subdirectory(orbis-kernel) add_subdirectory(rpcsx-os) add_subdirectory(rpcsx-gpu)