Merge pull request #71 from CapsCollective/feature/vulkan-upgrade

Upgraded Vulkan version to 1.4.328.1

Author: jonjondev

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.328.1"
+[string] $Spirv_Version="vulkan-sdk-1.4.328.1"
+[string] $Glslang_Version="vulkan-sdk-1.4.328.1"
 [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"

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.328.1"
+SPIRV_VERSION="vulkan-sdk-1.4.328.1"
+GLSLANG_VERSION="vulkan-sdk-1.4.328.1"
 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,16 +242,14 @@ 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}"
 }
 
 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}"
@@ -280,8 +282,10 @@ setup_moltenVk() {
     update_submodule vulkan/MoltenVK
     checkout_tags "${VULKAN_VENDOR_DIR}"/MoltenVK ${MOLTENVK_VERSION}
 
+    cp -f "${VULKAN_VENDOR_DIR}/known-good/MoltenVK-pbxproj" "${VULKAN_VENDOR_DIR}/MoltenVK/ExternalDependencies.xcodeproj/project.pbxproj"
+
     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 --v-headers-root "${VULKAN_VENDOR_DIR}/Vulkan-Headers" --spirv-tools-root "${VULKAN_VENDOR_DIR}/SPIRV-Tools")
     make -C "${VULKAN_VENDOR_DIR}"/MoltenVK macos -j"${NUMBER_OF_PROCESSORS}"
     mkdir -p "${VULKAN_LIB_DIR}"/icd.d
     mkdir -p "${VULKAN_INCLUDE_DIR}"