From 9921f5cf0c767e2bb60f647b70b7c36329d3cad4 Mon Sep 17 00:00:00 2001
From: Jesse Natalie <jenatali@microsoft.com>
Date: Mon, 18 Jul 2022 09:44:38 -0700
Subject: [PATCH] ci/windows: Install Graphics-Tools package on the base image

Reviewed-by: Yonggang Luo <luoyonggang@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/17600>
---
 .gitlab-ci/image-tags.yml              |  2 +-
 .gitlab-ci/windows/mesa_deps_choco.ps1 | 22 ++++++++++++++++++++++
 2 files changed, 23 insertions(+), 1 deletion(-)

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index fc2e6dc56ee..673c3840eac 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -18,7 +18,7 @@ variables:
    KERNEL_ROOTFS_TAG: "2022-08-08-skqp"
 
    WINDOWS_X64_VS_PATH: "windows/x64_vs"
-   WINDOWS_X64_VS_TAG: "2022-06-15-vs-winsdk"
+   WINDOWS_X64_VS_TAG: "2022-08-04-graphics-tools"
 
    WINDOWS_X64_BUILD_PATH: "windows/x64_build"
    WINDOWS_X64_BUILD_TAG: "2022-06-15-vs-winsdk"
diff --git a/.gitlab-ci/windows/mesa_deps_choco.ps1 b/.gitlab-ci/windows/mesa_deps_choco.ps1
index 2488e0f8526..58b052c387e 100644
--- a/.gitlab-ci/windows/mesa_deps_choco.ps1
+++ b/.gitlab-ci/windows/mesa_deps_choco.ps1
@@ -71,3 +71,25 @@ if (!$?) {
   Exit 1
 }
 Remove-Item C:\vulkan-runtime.exe -Force
+
+Get-Date
+Write-Host "Installing graphics tools (DirectX debug layer)"
+Set-Service -Name wuauserv -StartupType Manual
+if (!$?) {
+  Write-Host "Failed to enable Windows Update"
+  Exit 1
+}
+
+For ($i = 0; $i -lt 5; $i++) {
+  Dism /online /quiet /add-capability /capabilityname:Tools.Graphics.DirectX~~~~0.0.1.0
+  $graphics_tools_installed = $?
+  if ($graphics_tools_installed) {
+    Break
+  }
+}
+
+if (!$graphics_tools_installed) {
+  Write-Host "Failed to install graphics tools"
+  Get-Content C:\Windows\Logs\DISM\dism.log
+  Exit 1
+}