From e650d11b306b5ea07b4f30a6e59de679d70a0b0a Mon Sep 17 00:00:00 2001
From: JohnHolmesII <jedistephen@hotmail.com>
Date: Tue, 15 Feb 2022 20:23:57 -0800
Subject: [PATCH] CI: Update Vulkan to minimum version

---
 .ci/setup-windows.sh | 6 +++---
 .cirrus.yml          | 4 ++--
 azure-pipelines.yml  | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.ci/setup-windows.sh b/.ci/setup-windows.sh
index 571c964004..de96bb1530 100755
--- a/.ci/setup-windows.sh
+++ b/.ci/setup-windows.sh
@@ -21,7 +21,7 @@ QT_MM_URL="${QT_HOST}${QT_PREFIX}qtmultimedia${QT_SUFFIX}"
 QT_SVG_URL="${QT_HOST}${QT_PREFIX}qtsvg${QT_SUFFIX}"
 LLVMLIBS_URL='https://github.com/RPCS3/llvm-mirror/releases/download/custom-build-win/llvmlibs_mt.7z'
 GLSLANG_URL='https://github.com/RPCS3/glslang/releases/download/custom-build-win/glslanglibs_mt.7z'
-VULKAN_SDK_URL="https://www.dropbox.com/s/fjlh97hrz0crqxv/VulkanSDK-1.2.182.0-Installer.exe"
+VULKAN_SDK_URL="https://www.dropbox.com/s/o918fc11pfk8x9c/VulkanSDK-${VULKAN_VER}-Installer.exe"
 
 DEP_URLS="         \
     $QT_BASE_URL   \
@@ -29,7 +29,7 @@ DEP_URLS="         \
     $QT_DECL_URL   \
     $QT_TOOL_URL   \
     $QT_MM_URL     \
-    $QT_SVG_URL     \
+    $QT_SVG_URL    \
     $LLVMLIBS_URL  \
     $GLSLANG_URL   \
     $VULKAN_SDK_URL"
@@ -86,7 +86,7 @@ for url in $DEP_URLS; do
         # Need to subshell this or else it doesn't wait
         download_and_verify "$url" "$VULKAN_SDK_SHA" "sha256" "$fileName"
         cp "$CACHE_DIR/$fileName" .
-        _=$(echo "$fileName /S" | cmd)
+        _=$(echo "$fileName --accept-licenses --default-answer --confirm-command install" | cmd)
         continue
     ;;
     *) echo "Unknown url resource: $url"; exit 1 ;;
diff --git a/.cirrus.yml b/.cirrus.yml
index c2d86f54f6..523090e02c 100644
--- a/.cirrus.yml
+++ b/.cirrus.yml
@@ -22,8 +22,8 @@ windows_task:
     QT_VER_MSVC: 'msvc2019'
     QT_DATE: '202011130602'
     QTDIR: C:\Qt\${QT_VER}\${QT_VER_MSVC}_64
-    VULKAN_VER: '1.2.182.0'
-    VULKAN_SDK_SHA: '7089d48011f06c4a02a593913c6a9385d1652ab7765c25d2666d5d6ef4e24af8'
+    VULKAN_VER: '1.3.204.0'
+    VULKAN_SDK_SHA: '41f4996335cc5a545d7b2f6e5ff29cf3867789aae4be053a7069aa93408861fa'
     VULKAN_SDK: C:\VulkanSDK\${VULKAN_VER}
     CACHE_DIR: "./cache"
     UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 00c55d15e2..47b86931c8 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -63,8 +63,8 @@ jobs:
     QT_VER_MSVC: 'msvc2019'
     QT_DATE: '202011130602'
     QTDIR: C:\Qt\$(QT_VER)\$(QT_VER_MSVC)_64
-    VULKAN_VER: '1.2.182.0'
-    VULKAN_SDK_SHA: '7089d48011f06c4a02a593913c6a9385d1652ab7765c25d2666d5d6ef4e24af8'
+    VULKAN_VER: '1.3.204.0'
+    VULKAN_SDK_SHA: '41f4996335cc5a545d7b2f6e5ff29cf3867789aae4be053a7069aa93408861fa'
     VULKAN_SDK: C:\VulkanSDK\$(VULKAN_VER)
     CACHE_DIR: ./cache
     UPLOAD_COMMIT_HASH: 7d09e3be30805911226241afbb14f8cdc2eb054e