Skip to content

Commit dfb241f

Browse files
RaelrRaelr
committed
Bumped MoltenVK and Vulkan versions and removed python dependency
1 parent 52ff85a commit dfb241f

File tree

11 files changed

+31
-27
lines changed

11 files changed

+31
-27
lines changed

‎README.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ The following are dependencies for building and running the project:
4545

4646
- **All platforms**
4747
- [CMake](https://cmake.org/)
48-
- [Python](https://www.python.org/)
4948
- **macOS**
5049
- [GNU Make](https://www.gnu.org/software/make/)
5150
- [Clang Format](https://clang.llvm.org/docs/ClangFormat.html) (Linux & MacOS)

‎scripts/setup.ps1‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,10 @@ param (
99
)
1010

1111
[string] $Root_Dir=(pwd)
12-
[string] $Vulkan_Version= "v1.3.211"
13-
[string] $Spirv_Version="v2022.4"
12+
[string] $Vulkan_Version= "v1.3.250"
13+
[string] $Spirv_Version="sdk-1.3.250.1"
14+
[string] $Glslang_Version="12.2.0"
15+
[string] $Robin_Hood_Hashing_Version="3.11.5"
1416
[string] $Generator="MinGW Makefiles"
1517
[string] $Vendor_Dir="$Root_Dir\vendor"
1618

@@ -19,7 +21,7 @@ param (
1921

2022
[string] $Vulkan_Vendor_Dir="$Vendor_Dir/vulkan"
2123
[string] $Vulkan_Lib_Dir="$Vulkan_Vendor_Dir/lib"
22-
[string] $Vulkan_Include_Dir="$Vulkan_Vendor_Dir/include/vulkan"
24+
[string] $Vulkan_Include_Dir="$Vulkan_Vendor_Dir/include"
2325
[string] $Volk_Include_Dir="$Vulkan_Vendor_Dir/include/volk"
2426

2527
function Make-Dir {
@@ -137,6 +139,7 @@ function Setup-Glslang {
137139
Write-Output "Setting up glslang..."
138140
Write-Output "Cloning glslang..."
139141
Update-Submodule glslang
142+
Checkout-Tags "$Vendor_Dir/glslang" $Glslang_Version
140143

141144
Write-Output "Building glslang..."
142145
[string] $build_dir = "$Vendor_Dir/glslang/build"
@@ -181,7 +184,7 @@ function Setup-Vulkan-Headers {
181184

182185
Make-Dir $Vulkan_Include_Dir
183186

184-
Copy-Item -Path "$Vulkan_Vendor_Dir/Vulkan-Headers/include/vulkan/*" -Destination $Vulkan_Include_Dir -Include "*.h"
187+
Copy-Item -Path "$Vulkan_Vendor_Dir/Vulkan-Headers/build/install/include" -Destination $Vulkan_Include_Dir -Recurse
185188
}
186189

187190
function Setup-Vulkan-Loader {
@@ -211,6 +214,7 @@ function Setup-Robin-Hood-Hashing {
211214
Write-Output "Setting up Robin Hood Hashing..."
212215
Write-Output "Cloning Robin Hood Hashing..."
213216
Update-Submodule vulkan/robin-hood-hashing
217+
Checkout-Tags "$Vulkan_Vendor_Dir/robin-hood-hashing" $Robin_Hood_Hashing_Version
214218

215219
Write-Output "Building Robin Hood Hashing..."
216220
[string] $build_dir = "$Vulkan_Vendor_Dir/robin-hood-hashing/build"
@@ -231,7 +235,7 @@ function Setup-Spirv-Headers {
231235
Write-Output "Cloning SPIRV Headers..."
232236
Update-Submodule vulkan/SPIRV-Headers
233237

234-
Checkout-Tags "$Vulkan_Vendor_Dir/SPIRV-Headers" "sdk-1.3.231.1"
238+
Checkout-Tags "$Vulkan_Vendor_Dir/SPIRV-Headers" "$Spirv_Version"
235239

236240
Write-Output "Building SPIRV Headers..."
237241
[string] $build_dir = "$Vulkan_Vendor_Dir/SPIRV-Headers/build"
@@ -255,8 +259,7 @@ function Setup-Spirv-Tools {
255259

256260
Make-Dir $build_dir
257261

258-
python3 "$Vulkan_Vendor_Dir\SPIRV-Tools\utils\git-sync-deps"
259-
cmake .. -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="$build_dir\install" -S"$Vulkan_Vendor_Dir\SPIRV-Tools" -B"$build_dir"
262+
cmake .. -DCMAKE_BUILD_TYPE=Release -DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR="$Vulkan_Vendor_Dir/SPIRV-Headers" -DCMAKE_INSTALL_PREFIX="$build_dir\install" -S"$Vulkan_Vendor_Dir\SPIRV-Tools" -B"$build_dir"
260263
cmake --build $build_dir --parallel $env:NUMBER_OF_PROCESSORS --target install --config Release
261264
}
262265

@@ -273,8 +276,7 @@ function Setup-Validation-Layers {
273276
Make-Dir $build_dir
274277

275278
cmake `
276-
-DVULKAN_HEADERS_INSTALL_DIR="$Vulkan_Vendor_Dir/Vulkan-Headers/build/install" `
277-
-DVULKAN_LOADER_INSTALL_DIR="$Vulkan_Vendor_Dir/Vulkan-Loader/build" `
279+
-DVULKAN_HEADERS_INSTALL_DIR="$Vulkan_Vendor_Dir/Vulkan-Headers/build/install" ` `
278280
-DGLSLANG_INSTALL_DIR="$Vulkan_Vendor_Dir/glslang/build/install" `
279281
-DSPIRV_HEADERS_INSTALL_DIR="$Vulkan_Vendor_Dir/SPIRV-Headers/build/install" `
280282
-DSPIRV_TOOLS_INSTALL_DIR="$Vulkan_Vendor_Dir/SPIRV-Tools/build/install" `

‎scripts/setup.sh‎

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,15 +25,18 @@ else
2525
fi
2626

2727
# Set setup details
28-
VULKAN_VERSION="v1.3.231"
29-
SPIRV_VERSION="2022.4"
28+
VULKAN_VERSION="v1.3.250"
29+
SPIRV_VERSION="sdk-1.3.250.1"
30+
GLSLANG_VERSION="12.2.0"
31+
ROBIN_HOOD_HASHING_VERSION="3.11.5"
32+
MOLTENVK_VERSION="v1.2.4"
3033
GENERATOR="Unix Makefiles"
3134
VENDOR_DIR="${ROOT_DIR}/vendor"
3235

3336
# Vulkan dependency variables
3437
VULKAN_VENDOR_DIR="${VENDOR_DIR}/vulkan"
3538
VULKAN_LIB_DIR="${VULKAN_VENDOR_DIR}/lib"
36-
VULKAN_INCLUDE_DIR="${VULKAN_VENDOR_DIR}/include/vulkan"
39+
VULKAN_INCLUDE_DIR="${VULKAN_VENDOR_DIR}/include"
3740
VOLK_INCLUDE_DIR="${VULKAN_VENDOR_DIR}/include/volk"
3841

3942
update_submodules() {
@@ -72,6 +75,7 @@ setup_glslang() {
7275
echo "Setting up glslang..."
7376
echo "Cloning glslang..."
7477
update_submodules glslang
78+
checkout_tags "${VENDOR_DIR}"/glslang "$GLSLANG_VERSION"
7579

7680
echo "Building glslang..."
7781
mkdir -p "${VENDOR_DIR}"/glslang/build
@@ -113,7 +117,7 @@ setup_vulkan_headers() {
113117
cmake -DCMAKE_INSTALL_PREFIX="${BUILD_DIR}"/install -G "${GENERATOR}" -B"${BUILD_DIR}" -S"${VULKAN_VENDOR_DIR}"/Vulkan-Headers
114118
cmake --build "${BUILD_DIR}" --target install
115119
mkdir -p "${VULKAN_INCLUDE_DIR}"
116-
cp "${VULKAN_VENDOR_DIR}"/Vulkan-Headers/include/vulkan/**.h "${VULKAN_INCLUDE_DIR}"
120+
cp -r "${VULKAN_VENDOR_DIR}"/Vulkan-Headers/build/install/include/** "${VULKAN_INCLUDE_DIR}"
117121
}
118122

119123
setup_vulkan_loader() {
@@ -139,7 +143,7 @@ setup_moltenVk() {
139143
echo "Setting up MoltenVk..."
140144
echo "Cloning MoltenVk..."
141145
update_submodules vulkan/MoltenVK
142-
checkout_tags "${VULKAN_VENDOR_DIR}"/MoltenVK "v1.2.0"
146+
checkout_tags "${VULKAN_VENDOR_DIR}"/MoltenVK ${MOLTENVK_VERSION}
143147

144148
echo "Building MoltenVk..."
145149
(cd "${VULKAN_VENDOR_DIR}"/MoltenVK ; ./fetchDependencies --macos --v-headers-root "${VULKAN_VENDOR_DIR}"/Vulkan-Headers)
@@ -153,6 +157,7 @@ setup_robin_hood_hashing() {
153157
echo "Setting up Robin Hood Hashing..."
154158
echo "Cloning Robin Hood Hashing..."
155159
update_submodules vulkan/robin-hood-hashing
160+
checkout_tags "${VULKAN_VENDOR_DIR}"/robin-hood-hashing ${ROBIN_HOOD_HASHING_VERSION}
156161

157162
echo "Building Robin Hood Hashing..."
158163
local BUILD_DIR="${VULKAN_VENDOR_DIR}"/robin-hood-hashing/build
@@ -171,7 +176,7 @@ setup_spirv_headers() {
171176
echo "Cloning SPIRV Headers..."
172177
update_submodules vulkan/SPIRV-Headers
173178

174-
checkout_tags "${VULKAN_VENDOR_DIR}"/SPIRV-Headers "sdk-1.3.231.1"
179+
checkout_tags "${VULKAN_VENDOR_DIR}"/SPIRV-Headers "${SPIRV_VERSION}"
175180

176181
echo "Building SPIRV Headers..."
177182
local BUILD_DIR="${VULKAN_VENDOR_DIR}"/SPIRV-Headers/build
@@ -189,8 +194,7 @@ setup_spirv_tools() {
189194
echo "Building SPIRV Tools..."
190195
local BUILD_DIR="${VULKAN_VENDOR_DIR}"/SPIRV-Tools/build
191196
mkdir -p "${BUILD_DIR}"
192-
python3 "${VULKAN_VENDOR_DIR}"/SPIRV-Tools/utils/git-sync-deps
193-
cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${BUILD_DIR}"/install -S"${VULKAN_VENDOR_DIR}"/SPIRV-Tools -B"${BUILD_DIR}"
197+
cmake -DCMAKE_BUILD_TYPE=Release -DSPIRV_SKIP_TESTS=ON -DSPIRV_WERROR=OFF -DSPIRV-Headers_SOURCE_DIR="${VULKAN_VENDOR_DIR}/SPIRV-Headers" -DCMAKE_INSTALL_PREFIX="${BUILD_DIR}"/install -S"${VULKAN_VENDOR_DIR}"/SPIRV-Tools -B"${BUILD_DIR}"
194198
cmake --build "${BUILD_DIR}" --target install --config Release -j"${NUMBER_OF_PROCESSORS}"
195199
}
196200

@@ -205,7 +209,6 @@ setup_validation_layers() {
205209
mkdir -p "${BUILD_DIR}"
206210
cmake \
207211
-DVULKAN_HEADERS_INSTALL_DIR="${VULKAN_VENDOR_DIR}"/Vulkan-Headers/build/install \
208-
-DVULKAN_LOADER_INSTALL_DIR="${VULKAN_VENDOR_DIR}"/Vulkan-Loader/build \
209212
-DGLSLANG_INSTALL_DIR="${VENDOR_DIR}"/glslang/build/install \
210213
-DSPIRV_HEADERS_INSTALL_DIR="${VULKAN_VENDOR_DIR}"/SPIRV-Headers/build/install \
211214
-DSPIRV_TOOLS_INSTALL_DIR="${VULKAN_VENDOR_DIR}"/SPIRV-Tools/build/install \

‎vendor/glslang‎

Submodule glslang updated 1099 files

‎vendor/vulkan/MoltenVK‎

Submodule MoltenVK updated 202 files

‎vendor/vulkan/SPIRV-Headers‎

Submodule SPIRV-Headers updated 26 files

‎vendor/vulkan/SPIRV-Tools‎

Submodule SPIRV-Tools updated 715 files

‎vendor/vulkan/Vulkan-Headers‎

Submodule Vulkan-Headers updated 70 files

‎vendor/vulkan/Vulkan-Loader‎

Submodule Vulkan-Loader updated 113 files

‎vendor/vulkan/Vulkan-ValidationLayers‎

0 commit comments

Comments
 (0)