Skip to content

Commit 4167875

Browse files
committed
Updated powershell script to use new vulkan versions
1 parent 73a29b2 commit 4167875

File tree

7 files changed

+30
-32
lines changed

7 files changed

+30
-32
lines changed

scripts/setup.ps1

Lines changed: 24 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,9 @@ param (
1010
)
1111

1212
[string] $Root_Dir=(pwd)
13-
[string] $Vulkan_Version= "v1.3.250"
14-
[string] $Spirv_Version="sdk-1.3.250.1"
15-
[string] $Glslang_Version="12.2.0"
13+
[string] $Vulkan_Version= "vulkan-sdk-1.3.296.0"
14+
[string] $Spirv_Version="vulkan-sdk-1.3.296.0"
15+
[string] $Glslang_Version="vulkan-sdk-1.3.296.0"
1616
[string] $Robin_Hood_Hashing_Version="3.11.5"
1717
[string] $Generator="MinGW Makefiles"
1818
[string] $Vendor_Dir="$Root_Dir/vendor".Replace('\','/')
@@ -46,7 +46,7 @@ function Update-Submodule {
4646

4747
function Checkout-Tags {
4848
param([string] $Path=@(), [string] $Tag=@())
49-
git -C "$Path" fetch --all --tags ; git -C "$Path" checkout tags/"$Tag"
49+
git -C "$Path" fetch --all --tags --force ; git -C "$Path" checkout tags/"$Tag"
5050
}
5151

5252
function Setup-Utest {
@@ -196,17 +196,16 @@ function Setup-Vulkan-Headers {
196196
Make-Dir $build_dir
197197

198198
cmake `
199-
-G "$Generator" `
200199
$CMAKE_COMPILER `
201200
-DCMAKE_INSTALL_PREFIX="$build_dir/install" `
202201
-B"$build_dir" `
203202
-S"$Vulkan_Vendor_Dir/Vulkan-Headers"
204203

205-
mingw32-make -C $build_dir install -j"$env:NUMBER_OF_PROCESSORS"
204+
cmake --install "$build_dir" --prefix "$build_dir"
206205

207206
Make-Dir $Vulkan_Include_Dir
208207

209-
Get-ChildItem "$Vulkan_Vendor_Dir/Vulkan-Headers/build/install/include" | Copy-Item -Destination $Vulkan_Include_Dir -Recurse
208+
Get-ChildItem "$Vulkan_Vendor_Dir/Vulkan-Headers/build/include" | Copy-Item -Destination $Vulkan_Include_Dir -Recurse
210209
}
211210

212211
function Setup-Vulkan-Loader {
@@ -222,7 +221,7 @@ function Setup-Vulkan-Loader {
222221
cmake `
223222
$CMAKE_COMPILER `
224223
-DCMAKE_INSTALL_PREFIX="$build_dir" `
225-
-DVULKAN_HEADERS_INSTALL_DIR="$Vulkan_Vendor_Dir/Vulkan-Headers/build/install" `
224+
-DVULKAN_HEADERS_INSTALL_DIR="$Vulkan_Vendor_Dir/Vulkan-Headers/build" `
226225
-S"$Vulkan_Vendor_Dir/Vulkan-Loader" `
227226
-B"$build_dir"
228227

@@ -289,7 +288,6 @@ function Setup-Spirv-Tools {
289288
Make-Dir $build_dir
290289

291290
cmake `
292-
.. `
293291
$CMAKE_COMPILER `
294292
-DCMAKE_BUILD_TYPE=Release `
295293
-DSPIRV_SKIP_TESTS=ON `
@@ -325,8 +323,8 @@ function Setup-Validation-Layers {
325323

326324
cmake `
327325
$CMAKE_COMPILER `
328-
-DVULKAN_HEADERS_INSTALL_DIR="$Vulkan_Vendor_Dir/Vulkan-Headers/build/install" `
329-
-DGLSLANG_INSTALL_DIR="$Vulkan_Vendor_Dir/glslang/build/install" `
326+
-DVULKAN_HEADERS_INSTALL_DIR="$Vulkan_Vendor_Dir/Vulkan-Headers/build" `
327+
-DGLSLANG_INSTALL_DIR="$Vulkan_Vendor_Dir/glslang/build" `
330328
-DSPIRV_HEADERS_INSTALL_DIR="$Vulkan_Vendor_Dir/SPIRV-Headers/build/install" `
331329
-DSPIRV_TOOLS_INSTALL_DIR="$Vulkan_Vendor_Dir/SPIRV-Tools/build/install" `
332330
-DROBIN_HOOD_HASHING_INSTALL_DIR="$Vulkan_Vendor_Dir/robin-hood-hashing/build/install" `
@@ -349,26 +347,26 @@ if (Test-Path "$Vulkan_Lib_Dir") { Remove-Item -Path "$Vulkan_Lib_Dir" -Recurse
349347
if (Test-Path "$Vulkan_Vendor_Dir/vulkan/include") { Remove-Item -Path "$Vulkan_Vendor_Dir/vulkan/include" -Recurse -Force }
350348
if (Test-Path "$Vendor_Dir/include") { Remove-Item -Path "$Vendor_Dir/include" -Recurse -Force }
351349

352-
Setup-Utest
353-
Setup-Zlib
354-
Setup-LibPng
355-
Setup-FreeType
356-
Setup-Glfw
357-
Setup-Glslang
358-
Setup-Volk
359-
Setup-Vulkan-Headers
360-
Setup-Vulkan-Loader
350+
#Setup-Utest
351+
#Setup-Zlib
352+
#Setup-LibPng
353+
#Setup-FreeType
354+
#Setup-Glfw
355+
#Setup-Spirv-Headers
356+
#Setup-Spirv-Tools
357+
#Setup-Glslang
358+
#Setup-Volk
359+
#Setup-Vulkan-Headers
360+
#Setup-Vulkan-Loader
361361

362362
if ($Include_Validation_Layers)
363363
{
364-
Setup-Robin-Hood-Hashing
365-
Setup-Spirv-Headers
366-
Setup-Spirv-Tools
364+
#Setup-Robin-Hood-Hashing
367365
Setup-Validation-Layers
368366

369-
Write-Output "Configuring environment file..."
370-
if (!(Test-Path "$Root_Dir/.env")) { New-Item -Path "$Root_Dir/.env" -ItemType file }
371-
Set-Content -Path "$Root_Dir/.env" -Value "VK_LAYER_PATH=$Bin_Dir\examples\render\build\lib\explicit_layer.d"
367+
#Write-Output "Configuring environment file..."
368+
#if (!(Test-Path "$Root_Dir/.env")) { New-Item -Path "$Root_Dir/.env" -ItemType file }
369+
#Set-Content -Path "$Root_Dir/.env" -Value "VK_LAYER_PATH=$Bin_Dir\examples\render\build\lib\explicit_layer.d"
372370
}
373371

374372
Write-Output "Siege setup complete"

vendor/glslang

Submodule glslang updated 950 files

vendor/vulkan/SPIRV-Headers

Submodule SPIRV-Headers updated 49 files

vendor/vulkan/SPIRV-Tools

Submodule SPIRV-Tools updated 289 files

vendor/vulkan/Vulkan-Headers

Submodule Vulkan-Headers updated 85 files

vendor/vulkan/Vulkan-Loader

Submodule Vulkan-Loader updated 151 files

0 commit comments

Comments
 (0)