CI/windows: Update headers and Agility redist to 1.710.0-preview

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22320>

diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml
index ad72455..e7dfc3d 100644 (file)
--- a/.gitlab-ci/image-tags.yml
+++ b/.gitlab-ci/image-tags.yml
@@ -27,7 +27,7 @@ variables:
    WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"
 
    WINDOWS_X64_BUILD_PATH: "windows/x64_build"
-   WINDOWS_X64_BUILD_TAG: "2023-02-07-llvm-15"
+   WINDOWS_X64_BUILD_TAG: "2023-04-05-agility-710"
 
    WINDOWS_X64_TEST_PATH: "windows/x64_test"
-   WINDOWS_X64_TEST_TAG: "2023-03-20-warp-update"
+   WINDOWS_X64_TEST_TAG: "2023-04-05-agility-710"

diff --git a/.gitlab-ci/windows/mesa_deps_build.ps1 b/.gitlab-ci/windows/mesa_deps_build.ps1
index d09bb49..a863e34 100644 (file)
--- a/.gitlab-ci/windows/mesa_deps_build.ps1
+++ b/.gitlab-ci/windows/mesa_deps_build.ps1
@@ -12,7 +12,7 @@ $depsInstallPath="C:\mesa-deps"
 
 Get-Date
 Write-Host "Cloning DirectX-Headers"
-git clone -b v1.606.4 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
+git clone -b v1.710.0-preview --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
 if (!$?) {
   Write-Host "Failed to clone DirectX-Headers repository"
   Exit 1

diff --git a/.gitlab-ci/windows/mesa_deps_test.ps1 b/.gitlab-ci/windows/mesa_deps_test.ps1
index c96ba49..9aaf10e 100644 (file)
--- a/.gitlab-ci/windows/mesa_deps_test.ps1
+++ b/.gitlab-ci/windows/mesa_deps_test.ps1
@@ -132,7 +132,7 @@ cargo install --git https://gitlab.freedesktop.org/anholt/deqp-runner.git
 
 Get-Date
 Write-Host "Downloading DirectX 12 Agility SDK"
-Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.706.3-preview -OutFile 'agility.zip'
+Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.710.0-preview -OutFile 'agility.zip'
 Expand-Archive -Path 'agility.zip' -DestinationPath 'C:\agility'
 Remove-Item 'agility.zip'
 

diff --git a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
index d6971eb..20e7ecd 100644 (file)
--- a/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/d3d12/ci/gitlab-ci.yml
@@ -14,7 +14,7 @@
     GALLIUM_DRIVER: d3d12
     WGL_DISABLE_ERROR_DIALOGS: "true"
     D3D12_AGILITY_RELATIVE_PATH: "D3D12\\"
-    D3D12_AGILITY_SDK_VERSION: 706
+    D3D12_AGILITY_SDK_VERSION: 710
 
 .d3d12-test-piglit:
   extends:

diff --git a/src/microsoft/ci/gitlab-ci.yml b/src/microsoft/ci/gitlab-ci.yml
index 2630428..6b0886a 100644 (file)
--- a/src/microsoft/ci/gitlab-ci.yml
+++ b/src/microsoft/ci/gitlab-ci.yml
@@ -33,7 +33,7 @@ test-dozen-deqp:
   variables:
     GIT_STRATEGY: none # testing doesn't build anything from source
     DZN_AGILITY_RELATIVE_PATH: "D3D12\\"
-    DZN_AGILITY_SDK_VERSION: 706
+    DZN_AGILITY_SDK_VERSION: 710
   script:
     - . _install/deqp_runner_run.ps1
   artifacts: