AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ci: Add Windows SDK 26100 to msvc image

Browse Source 
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>
This commit is contained in:
Sil Vilerino
2025-05-10 08:42:34 -04:00
committed by Marge Bot
parent 9b1c4f2e04
commit 38d2133e3e
5 changed files with 10 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.gitlab-ci/image-tags.yml
View File

@@ -40,8 +40,8 @@ variables:
FIRMWARE_TAG: "36f9bbfa" FIRMWARE_TAG: "36f9bbfa"
FIRMWARE_REPO: "gfx-ci/firmware" 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"

3
.gitlab-ci/windows/mesa_deps_msvc.ps1
View File

@@ -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.ComponentGroup.VC.Tools.142.x86.x64", `
"--add", "Microsoft.VisualStudio.Component.VC.Llvm.Clang", ` "--add", "Microsoft.VisualStudio.Component.VC.Llvm.Clang", `
"--add", "Microsoft.VisualStudio.Component.Graphics.Tools", ` "--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 (!$?) { if (!$?) {
Write-Host "Failed to install Visual Studio tools" Write-Host "Failed to install Visual Studio tools"

2
.gitlab-ci/windows/mesa_deps_test_deqp.ps1
View File

@@ -38,6 +38,8 @@ cmake -S $($deqp_source) `
-B . ` -B . `
-GNinja ` -GNinja `
-DCMAKE_BUILD_TYPE=Release ` -DCMAKE_BUILD_TYPE=Release `
-DCMAKE_POLICY_VERSION_MINIMUM="3.5" `
-DCMAKE_SYSTEM_VERSION="10.0.20348.0" `
-DDEQP_TARGET=default && ` -DDEQP_TARGET=default && `
ninja -j32 ninja -j32
if (!$?) { if (!$?) {

2
.gitlab-ci/windows/mesa_deps_test_piglit.ps1
View File

@@ -69,6 +69,8 @@ cmake -S . -B . `
-DPIGLIT_USE_WAFFLE=ON ` -DPIGLIT_USE_WAFFLE=ON `
-DWaffle_INCLUDE_DIRS="$waffle_install\include\waffle-1" ` -DWaffle_INCLUDE_DIRS="$waffle_install\include\waffle-1" `
-DWaffle_LDFLAGS="$waffle_install\lib\libwaffle-1.a" ` -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" && ` -DGLEXT_INCLUDE_DIR="$source_dir\glext" && `
ninja -j32 ninja -j32
if (!$?) { if (!$?) {

1
meson.build
View File

@@ -1017,6 +1017,7 @@ elif host_machine.system() == 'windows'
'-D_ALLOW_KEYWORD_MACROS', '-D_ALLOW_KEYWORD_MACROS',
'-D_HAS_EXCEPTIONS=0', # Tell C++ STL to not use exceptions '-D_HAS_EXCEPTIONS=0', # Tell C++ STL to not use exceptions
'-DNOMINMAX', '-DNOMINMAX',
'-D_UCRT_NOISY_NAN', # https://developercommunity.visualstudio.com/t/NAN-is-no-longer-compile-time-constant-i/10688907?viewtype=all
] ]
else else
# When the target is not mingw/ucrt # When the target is not mingw/ucrt