From 38d2133e3eb3f0ba2a60355387fcaa4d84a17a5f Mon Sep 17 00:00:00 2001
From: Sil Vilerino <sivileri@microsoft.com>
Date: Sat, 10 May 2025 08:42:34 -0400
Subject: [PATCH] ci: Add Windows SDK 26100 to msvc image

Keep older 10.0.20348.0 SDK as well. Also change:
mesa_deps_test_piglit - Add CMAKE_POLICY_VERSION_MINIMUM=3.5 and _UCRT_NOISY_NAN
mesa_deps_test_deqp - Add CMAKE_POLICY_VERSION_MINIMUM=3.5 and CMAKE_SYSTEM_VERSION=10.0.20348.0
meson: When building with MSVC, add -D_UCRT_NOISY_NAN to workaround Win SDK 26100

D_UCRT_NOISY_NAN is for SDK 26100 issue:
https://developercommunity.visualstudio.com/t/NAN-is-no-longer-compile-time-constant-i/10688907

Reviewed-by: Pohsiang Hsu <pohhsu@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/35264>
---
 .gitlab-ci/image-tags.yml                    | 6 +++---
 .gitlab-ci/windows/mesa_deps_msvc.ps1        | 3 ++-
 .gitlab-ci/windows/mesa_deps_test_deqp.ps1   | 2 ++
 .gitlab-ci/windows/mesa_deps_test_piglit.ps1 | 2 ++
 meson.build                                  | 1 +
 5 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index afc246008ce..c5fa41c3e5c 100644
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -40,8 +40,8 @@ variables:
   FIRMWARE_TAG: "36f9bbfa"
   FIRMWARE_REPO: "gfx-ci/firmware"
 
-  WINDOWS_X64_MSVC_TAG: "20250129-llvm19"
+  WINDOWS_X64_MSVC_TAG: "20250513-updatesdk2"
 
-  WINDOWS_X64_BUILD_TAG: "20250129-llvm19"
+  WINDOWS_X64_BUILD_TAG: "20250513-updatesdk2"
 
-  WINDOWS_X64_TEST_TAG: "20250129-llvm19"
+  WINDOWS_X64_TEST_TAG: "20250513-updatesdk2"
diff --git a/.gitlab-ci/windows/mesa_deps_msvc.ps1 b/.gitlab-ci/windows/mesa_deps_msvc.ps1
index 50702ba5f48..cc41bf13c17 100644
--- a/.gitlab-ci/windows/mesa_deps_msvc.ps1
+++ b/.gitlab-ci/windows/mesa_deps_msvc.ps1
@@ -32,7 +32,8 @@ Start-Process -NoNewWindow -Wait -FilePath C:\vs_buildtools.exe `
 "--add", "Microsoft.VisualStudio.ComponentGroup.VC.Tools.142.x86.x64", `
 "--add", "Microsoft.VisualStudio.Component.VC.Llvm.Clang", `
 "--add", "Microsoft.VisualStudio.Component.Graphics.Tools", `
-"--add", "Microsoft.VisualStudio.Component.Windows10SDK.20348"
+"--add", "Microsoft.VisualStudio.Component.Windows10SDK.20348", `
+"--add", "Microsoft.VisualStudio.Component.Windows11SDK.26100"
 
 if (!$?) {
   Write-Host "Failed to install Visual Studio tools"
diff --git a/.gitlab-ci/windows/mesa_deps_test_deqp.ps1 b/.gitlab-ci/windows/mesa_deps_test_deqp.ps1
index 06edbf2ad86..8ee434a351b 100644
--- a/.gitlab-ci/windows/mesa_deps_test_deqp.ps1
+++ b/.gitlab-ci/windows/mesa_deps_test_deqp.ps1
@@ -38,6 +38,8 @@ cmake -S $($deqp_source) `
 -B . `
 -GNinja `
 -DCMAKE_BUILD_TYPE=Release `
+-DCMAKE_POLICY_VERSION_MINIMUM="3.5" `
+-DCMAKE_SYSTEM_VERSION="10.0.20348.0" `
 -DDEQP_TARGET=default && `
 ninja -j32
 if (!$?) {
diff --git a/.gitlab-ci/windows/mesa_deps_test_piglit.ps1 b/.gitlab-ci/windows/mesa_deps_test_piglit.ps1
index c8853795959..99097196fd2 100644
--- a/.gitlab-ci/windows/mesa_deps_test_piglit.ps1
+++ b/.gitlab-ci/windows/mesa_deps_test_piglit.ps1
@@ -69,6 +69,8 @@ cmake -S . -B . `
 -DPIGLIT_USE_WAFFLE=ON `
 -DWaffle_INCLUDE_DIRS="$waffle_install\include\waffle-1" `
 -DWaffle_LDFLAGS="$waffle_install\lib\libwaffle-1.a" `
+-DCMAKE_POLICY_VERSION_MINIMUM="3.5" `
+-DCMAKE_C_FLAGS="-D_UCRT_NOISY_NAN=1" `
 -DGLEXT_INCLUDE_DIR="$source_dir\glext" && `
 ninja -j32
 if (!$?) {
diff --git a/meson.build b/meson.build
index 99145b3d530..7462bba29e7 100644
--- a/meson.build
+++ b/meson.build
@@ -1017,6 +1017,7 @@ elif host_machine.system() == 'windows'
       '-D_ALLOW_KEYWORD_MACROS',
       '-D_HAS_EXCEPTIONS=0', # Tell C++ STL to not use exceptions
       '-DNOMINMAX',
+      '-D_UCRT_NOISY_NAN', # https://developercommunity.visualstudio.com/t/NAN-is-no-longer-compile-time-constant-i/10688907?viewtype=all
     ]
   else
     # When the target is not mingw/ucrt