diff --git a/scripts/setup.ps1 b/scripts/setup.ps1 index c13b1323..4af459ee 100644 --- a/scripts/setup.ps1 +++ b/scripts/setup.ps1 @@ -10,9 +10,9 @@ param ( ) # Dependency versions -[string] $Vulkan_Version= "vulkan-sdk-1.4.313" -[string] $Spirv_Version="vulkan-sdk-1.4.313" -[string] $Glslang_Version="vulkan-sdk-1.4.313" +[string] $Vulkan_Version= "vulkan-sdk-1.4.321.0" +[string] $Spirv_Version="vulkan-sdk-1.4.321.0" +[string] $Glslang_Version="vulkan-sdk-1.4.321.0" [string] $Robin_Hood_Hashing_Version="3.11.5" [string] $FreeType_Version="VER-2-13-3" [string] $LibPng_Version="v1.6.50" @@ -179,7 +179,7 @@ function Setup-Vulkan-Headers { Write-Output "Setting up Vulkan Headers..." Write-Output "Cloning Vulkan Headers..." Update-Submodule vulkan/Vulkan-Headers - Checkout-Tags "$Vulkan_Vendor_Dir/Vulkan-Headers" "$Vulkan_Version.0" + Checkout-Tags "$Vulkan_Vendor_Dir/Vulkan-Headers" "$Vulkan_Version" Write-Output "Building Vulkan Headers..." [string] $build_dir = "$Vulkan_Vendor_Dir/Vulkan-Headers/build" @@ -198,7 +198,7 @@ function Setup-Spirv-Headers { Write-Output "Setting up SPIRV Headers..." Write-Output "Cloning SPIRV Headers..." Update-Submodule vulkan/SPIRV-Headers - Checkout-Tags "$Vulkan_Vendor_Dir/SPIRV-Headers" "$Spirv_Version.0" + Checkout-Tags "$Vulkan_Vendor_Dir/SPIRV-Headers" "$Spirv_Version" Write-Output "Building SPIRV Headers..." [string] $build_dir = "$Vulkan_Vendor_Dir/SPIRV-Headers/build" @@ -215,7 +215,7 @@ function Setup-Spirv-Tools { Write-Output "Setting up Spirv Tools..." Write-Output "Cloning SPIRV Tools..." Update-Submodule vulkan/SPIRV-Tools - Checkout-Tags "$Vulkan_Vendor_Dir/SPIRV-Tools" "$Spirv_Version.0" + Checkout-Tags "$Vulkan_Vendor_Dir/SPIRV-Tools" "$Spirv_Version" Write-Output "Building SPIRV Tools..." [string] $build_dir = "$Vulkan_Vendor_Dir/SPIRV-Tools/build" @@ -258,6 +258,7 @@ function Setup-Volk { Write-Output "Setting up volk..." Write-Output "Cloning volk..." Update-Submodule vulkan/volk + Checkout-Tags "$Vulkan_Vendor_Dir/volk" "$Vulkan_Version" Write-Output "Building volk..." Make-Dir $Volk_Include_Dir @@ -270,7 +271,7 @@ function Setup-Vulkan-Loader { Write-Output "Setting up Vulkan Loader..." Write-Output "Cloning Vulkan Loader..." Update-Submodule vulkan/Vulkan-Loader - Checkout-Tags "$Vulkan_Vendor_Dir/Vulkan-Loader" "$Vulkan_Version.0" + Checkout-Tags "$Vulkan_Vendor_Dir/Vulkan-Loader" "$Vulkan_Version" Write-Output "Building Vulkan Loader..." [string] $build_dir = "$Vulkan_Vendor_Dir/Vulkan-Loader/build" @@ -310,7 +311,7 @@ function Setup-Vulkan-Utility-Libraries Write-Output "Setting up Vulkan Utility Libraries..." Write-Output "Cloning Vulkan Utility Libraries..." Update-Submodule vulkan\Vulkan-Utility-Libraries - Checkout-Tags "$Vulkan_Vendor_Dir\Vulkan-Utility-Libraries" "$Vulkan_Version.0" + Checkout-Tags "$Vulkan_Vendor_Dir\Vulkan-Utility-Libraries" "$Vulkan_Version" Write-Output "Building Vulkan Validation Layers..." [string] $build_dir = "$Vulkan_Vendor_Dir\Vulkan-Utility-Libraries/build" @@ -329,7 +330,7 @@ function Setup-Validation-Layers { Write-Output "Setting up Vulkan Validation Layers..." Write-Output "Cloning Vulkan ValidationLayers..." Update-Submodule vulkan/Vulkan-ValidationLayers - Checkout-Tags "$Vulkan_Vendor_Dir/Vulkan-ValidationLayers" "$Vulkan_Version.0" + Checkout-Tags "$Vulkan_Vendor_Dir/Vulkan-ValidationLayers" "$Vulkan_Version" Write-Output "Building Vulkan Validation Layers..." [string] $build_dir = "$Vulkan_Vendor_Dir/Vulkan-ValidationLayers/build" diff --git a/scripts/setup.sh b/scripts/setup.sh index efd6903f..7bf5be8f 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -8,11 +8,11 @@ # https://opensource.org/licenses/Zlib # Dependency versions -VULKAN_VERSION="vulkan-sdk-1.3.296.0" -SPIRV_VERSION="vulkan-sdk-1.3.296.0" -GLSLANG_VERSION="vulkan-sdk-1.3.296.0" +VULKAN_VERSION="vulkan-sdk-1.4.321.0" +SPIRV_VERSION="vulkan-sdk-1.4.321.0" +GLSLANG_VERSION="vulkan-sdk-1.4.321.0" ROBIN_HOOD_HASHING_VERSION="3.11.5" -MOLTENVK_VERSION="v1.2.11" +MOLTENVK_VERSION="v1.4.0" FREETYPE_VERSION="VER-2-13-3" LIBPNG_VERSION="v1.6.50" ZLIB_VERSION="v1.3.1" @@ -205,6 +205,9 @@ setup_spirv_tools() { update_submodule vulkan/SPIRV-Tools checkout_tags "${VULKAN_VENDOR_DIR}"/SPIRV-Tools "$SPIRV_VERSION" + echo "Linking to SPIRV Headers..." + ln -sfn "${VULKAN_VENDOR_DIR}"/SPIRV-Headers "${VULKAN_VENDOR_DIR}"/SPIRV-Tools/external/spirv-headers + echo "Building SPIRV Tools..." local BUILD_DIR="${VULKAN_VENDOR_DIR}"/SPIRV-Tools/build mkdir -p "${BUILD_DIR}" @@ -217,8 +220,6 @@ setup_spirv_tools() { -S"${VULKAN_VENDOR_DIR}"/SPIRV-Tools \ -B"${BUILD_DIR}" cmake --build "${BUILD_DIR}" --target install --config Release -j"${NUMBER_OF_PROCESSORS}" - - ln -sfn "${VULKAN_VENDOR_DIR}"/SPIRV-Headers "${VULKAN_VENDOR_DIR}"/SPIRV-Tools/external/spirv-headers } setup_glslang() { @@ -227,6 +228,9 @@ setup_glslang() { update_submodule glslang checkout_tags "${VENDOR_DIR}"/glslang "$GLSLANG_VERSION" + echo "Linking to SPIRV Tools..." + ln -sfn "${VULKAN_VENDOR_DIR}"/SPIRV-Tools "${VENDOR_DIR}"/glslang/External/spirv-tools + echo "Building glslang..." local BUILD_DIR="${VENDOR_DIR}"/glslang/build mkdir -p "${BUILD_DIR}" @@ -238,9 +242,6 @@ setup_glslang() { -DSPIRV-Tools-opt_INCLUDE_DIRS="${VULKAN_VENDOR_DIR}"/SPIRV-Tools/build/install/include \ -S"${VENDOR_DIR}"/glslang \ -B"${BUILD_DIR}" - - ln -sfn "${VULKAN_VENDOR_DIR}"/SPIRV-Tools "${VENDOR_DIR}"/glslang/External/spirv-tools - cmake --build "${BUILD_DIR}" --target install -- -j"${NUMBER_OF_PROCESSORS}" } @@ -248,6 +249,7 @@ setup_volk() { echo "Setting up volk..." echo "Cloning volk..." update_submodule vulkan/volk + checkout_tags "${VULKAN_VENDOR_DIR}"/volk "$VULKAN_VERSION" echo "Building volk..." mkdir -p "${VOLK_INCLUDE_DIR}" @@ -281,7 +283,7 @@ setup_moltenVk() { checkout_tags "${VULKAN_VENDOR_DIR}"/MoltenVK ${MOLTENVK_VERSION} echo "Building MoltenVk..." - (cd "${VULKAN_VENDOR_DIR}"/MoltenVK ; ./fetchDependencies --macos --v-headers-root "${VULKAN_VENDOR_DIR}"/Vulkan-Headers --glslang-root "${VENDOR_DIR}"/glslang) + (cd "${VULKAN_VENDOR_DIR}"/MoltenVK ; ./fetchDependencies --macos) make -C "${VULKAN_VENDOR_DIR}"/MoltenVK macos -j"${NUMBER_OF_PROCESSORS}" mkdir -p "${VULKAN_LIB_DIR}"/icd.d mkdir -p "${VULKAN_INCLUDE_DIR}" diff --git a/vendor/glslang b/vendor/glslang index fc9889c8..8a85691a 160000 --- a/vendor/glslang +++ b/vendor/glslang @@ -1 +1 @@ -Subproject commit fc9889c889561c5882e83819dcaffef5ed45529b +Subproject commit 8a85691a0740d390761a1008b4696f57facd02c4 diff --git a/vendor/vulkan/MoltenVK b/vendor/vulkan/MoltenVK index 81541f64..45887054 160000 --- a/vendor/vulkan/MoltenVK +++ b/vendor/vulkan/MoltenVK @@ -1 +1 @@ -Subproject commit 81541f6488c5feeace53867fc8ab612e578766da +Subproject commit 458870543b9bcf6b0edd6f90aaa776707b310d96 diff --git a/vendor/vulkan/SPIRV-Headers b/vendor/vulkan/SPIRV-Headers index aa6cef19..2a611a97 160000 --- a/vendor/vulkan/SPIRV-Headers +++ b/vendor/vulkan/SPIRV-Headers @@ -1 +1 @@ -Subproject commit aa6cef192b8e693916eb713e7a9ccadf06062ceb +Subproject commit 2a611a970fdbc41ac2e3e328802aed9985352dca diff --git a/vendor/vulkan/SPIRV-Tools b/vendor/vulkan/SPIRV-Tools index a62abcb4..33e02568 160000 --- a/vendor/vulkan/SPIRV-Tools +++ b/vendor/vulkan/SPIRV-Tools @@ -1 +1 @@ -Subproject commit a62abcb402009b9ca5975e6167c09f237f630e0e +Subproject commit 33e02568181e3312f49a3cf33df470bf96ef293a diff --git a/vendor/vulkan/Vulkan-Headers b/vendor/vulkan/Vulkan-Headers index 409c16be..2cd90f9d 160000 --- a/vendor/vulkan/Vulkan-Headers +++ b/vendor/vulkan/Vulkan-Headers @@ -1 +1 @@ -Subproject commit 409c16be502e39fe70dd6fe2d9ad4842ef2c9a53 +Subproject commit 2cd90f9d20df57eac214c148f3aed885372ddcfe diff --git a/vendor/vulkan/Vulkan-Loader b/vendor/vulkan/Vulkan-Loader index fb786074..da8d2caa 160000 --- a/vendor/vulkan/Vulkan-Loader +++ b/vendor/vulkan/Vulkan-Loader @@ -1 +1 @@ -Subproject commit fb78607414e154c7a5c01b23177ba719c8a44909 +Subproject commit da8d2caad9341ca8c5a7c3deba217d7da50a7c24 diff --git a/vendor/vulkan/Vulkan-Utility-Libraries b/vendor/vulkan/Vulkan-Utility-Libraries index 4e246c56..ec329e27 160000 --- a/vendor/vulkan/Vulkan-Utility-Libraries +++ b/vendor/vulkan/Vulkan-Utility-Libraries @@ -1 +1 @@ -Subproject commit 4e246c56ec5afb5ad66b9b04374d39ac04675c8e +Subproject commit ec329e2721921f79743b90307ee047d08e057788 diff --git a/vendor/vulkan/Vulkan-ValidationLayers b/vendor/vulkan/Vulkan-ValidationLayers index 50b87dd4..fee7b2b4 160000 --- a/vendor/vulkan/Vulkan-ValidationLayers +++ b/vendor/vulkan/Vulkan-ValidationLayers @@ -1 +1 @@ -Subproject commit 50b87dd4be883b63c10e3c4f7b9c5aac0c82efd3 +Subproject commit fee7b2b4a926355e48668e29570be129eb82cb36 diff --git a/vendor/vulkan/volk b/vendor/vulkan/volk index 2784718c..a8da8ef3 160000 --- a/vendor/vulkan/volk +++ b/vendor/vulkan/volk @@ -1 +1 @@ -Subproject commit 2784718c913433d718561f9a9488996b4c05c2ff +Subproject commit a8da8ef3368482b0ee9b0ec0c6079a16a89c6924