From 1cdf0b38ae4a141b03d5e4f909387d4ef6289b91 Mon Sep 17 00:00:00 2001
From: Tero Heikkinen <tero.heikkinen@qt.io>
Date: Tue, 3 Dec 2024 22:30:38 +0200
Subject: [PATCH] Provisioning: Add missing Vulkan library to Windows on ARM

Fixes: QTQAINFRA-6830
Change-Id: Ia074c55ddd20414f0d6b0dbcc674cc8eb82b1cf8
Reviewed-by: Axel Spoerl <axel.spoerl@qt.io>
Reviewed-by: Jonas Karlsson <jonas.karlsson@qt.io>
(cherry picked from commit e17927996244732778b9a5b0e72211ea1e9e0937)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
(cherry picked from commit 5e74968c61cc1e0bb421aa7c862261f35833cf14)
---
 .../provisioning/common/windows/vulkansdk.ps1 | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/coin/provisioning/common/windows/vulkansdk.ps1 b/coin/provisioning/common/windows/vulkansdk.ps1
index aeeff696..57fd63a1 100644
--- a/coin/provisioning/common/windows/vulkansdk.ps1
+++ b/coin/provisioning/common/windows/vulkansdk.ps1
@@ -6,13 +6,36 @@
 # This script will install Vulkan SDK
 # Original Download page: https://vulkan.lunarg.com/sdk/home#windows
 
-$version = "1.2.182.0"
+$cpu_arch = Get-CpuArchitecture
+Write-Host "Installing $cpu_arch Vulkan SDK"
+$version = "1.2.182.0"  # TODO: Update to newest 1.3.296.0
+switch ($cpu_arch) {
+    arm64 {
+        $version = "1.3.296.0"
+        $externalUrl = "https://sdk.lunarg.com/sdk/download/$version/warm/InstallVulkanARM64-$version.exe"
+        $internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\InstallVulkanARM64-$version.exe"
+        $sha1 = "7d47d8dd10c09d363e6103925c4a032abf7b2c02"
+        $installArgs = "--accept-licenses --default-answer --confirm-command install"
+        Break
+    }
+    x64 {
+        $externalUrl = "https://sdk.lunarg.com/sdk/download/$version/windows/VulkanSDK-$version-Installer.exe"
+        $internalUrl = "\\ci-files01-hki.ci.qt.io\provisioning\windows\VulkanSDK-$version-Installer.exe"
+        $sha1 = "1b662f338bfbfdd00fb9b0c09113eacb94f68a0e"
+        $installArgs = "/S"
+        Break
+    }
+    default {
+        throw "Unknown architecture $cpu_arch"
+    }
+}
+
 $vulkanPackage = "C:\Windows\Temp\vulkan-installer-$version.exe"
-$sha1 = "1b662f338bfbfdd00fb9b0c09113eacb94f68a0e"
-Download "https://sdk.lunarg.com/sdk/download/1.2.182.0/windows/VulkanSDK-$version-Installer.exe" "\\ci-files01-hki.ci.qt.io\provisioning\windows\VulkanSDK-$version-Installer.exe" $vulkanPackage
+
+Download "$externalUrl" "$internalUrl" "$vulkanPackage"
 Verify-Checksum "$vulkanPackage" "$sha1"
 
-Run-Executable $vulkanPackage "/S"
+Run-Executable "$vulkanPackage" "$installArgs"
 
 Write-Host "Cleaning $vulkanPackage.."
 Remove "$vulkanPackage"