From e54e8fceecaf817c2663f2019442e62d32aecb4c Mon Sep 17 00:00:00 2001 From: Silvio Vilerino Date: Thu, 26 Feb 2026 16:11:25 -0500 Subject: [PATCH] ci: Bump DirectX-Headers and Agility SDK dependencies to v1.619.1 Reviewed-by: Jesse Natalie Part-of: --- .gitlab-ci/container/build-directx-headers.sh | 2 +- .gitlab-ci/image-tags.yml | 6 +++--- .gitlab-ci/windows/mesa_deps_build.ps1 | 2 +- .gitlab-ci/windows/mesa_deps_d3d.ps1 | 2 +- meson.build | 2 +- src/gallium/drivers/d3d12/ci/gitlab-ci-inc.yml | 2 +- src/microsoft/ci/gitlab-ci.yml | 2 +- subprojects/DirectX-Headers.wrap | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci/container/build-directx-headers.sh b/.gitlab-ci/container/build-directx-headers.sh index 47cd742747d..18e99d04517 100644 --- a/.gitlab-ci/container/build-directx-headers.sh +++ b/.gitlab-ci/container/build-directx-headers.sh @@ -9,7 +9,7 @@ set -uex section_start directx-headers "Building directx-headers" -git clone https://github.com/microsoft/DirectX-Headers -b v1.618.1 --depth 1 +git clone https://github.com/microsoft/DirectX-Headers -b v1.619.1 --depth 1 pushd DirectX-Headers meson setup build --backend=ninja --buildtype=release -Dbuild-test=false ${EXTRA_MESON_ARGS:-} meson install -C build diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 1952481b4d3..1f0e05405f0 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -20,7 +20,7 @@ include: variables: DEBIAN_BUILD_BASE_TAG: "20251016-riscv" - DEBIAN_BUILD_TAG: "20260106-android16" + DEBIAN_BUILD_TAG: "20260309-D3D619" DEBIAN_TEST_BASE_TAG: "20260201-deqp-runner" DEBIAN_TEST_ANDROID_TAG: "20260302-cuttlefish" @@ -40,6 +40,6 @@ variables: WINDOWS_X64_MSVC_TAG: "20251120-bison" - WINDOWS_X64_BUILD_TAG: "20251120-bison" + WINDOWS_X64_BUILD_TAG: "20260309-D3D619" - WINDOWS_X64_TEST_TAG: "20251120-bison" + WINDOWS_X64_TEST_TAG: "20260309-D3D619" diff --git a/.gitlab-ci/windows/mesa_deps_build.ps1 b/.gitlab-ci/windows/mesa_deps_build.ps1 index 717bcbf2188..d4dfff7d5b0 100644 --- 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.618.1 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers +git clone -b v1.619.1 --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_d3d.ps1 b/.gitlab-ci/windows/mesa_deps_d3d.ps1 index 736db6cb334..a224e2a4562 100644 --- a/.gitlab-ci/windows/mesa_deps_d3d.ps1 +++ b/.gitlab-ci/windows/mesa_deps_d3d.ps1 @@ -8,7 +8,7 @@ $depsInstallPath="C:\mesa-deps" Write-Host "Downloading DirectX 12 Agility SDK at:" Get-Date -Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.618.1 -OutFile 'agility.zip' +Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.619.1 -OutFile 'agility.zip' Expand-Archive -Path 'agility.zip' -DestinationPath 'C:\agility' # Copy Agility SDK into mesa-deps\bin\D3D12 New-Item -ErrorAction SilentlyContinue -ItemType Directory -Path $depsInstallPath\bin -Name 'D3D12' diff --git a/meson.build b/meson.build index f2b32e7fbe5..43b1afd7ba9 100644 --- a/meson.build +++ b/meson.build @@ -670,7 +670,7 @@ if with_gallium_d3d12 or with_microsoft_clc or with_microsoft_vk or (with_any_vk dep_dxheaders = dependency('directx-headers', required : false) if not dep_dxheaders.found() dep_dxheaders = dependency('DirectX-Headers', - version : '>= 1.618.1', + version : '>= 1.619.1', fallback : ['DirectX-Headers', 'dep_dxheaders'], required : with_gallium_d3d12 or with_microsoft_vk ) diff --git a/src/gallium/drivers/d3d12/ci/gitlab-ci-inc.yml b/src/gallium/drivers/d3d12/ci/gitlab-ci-inc.yml index 6f4033d211e..083117f2d81 100644 --- a/src/gallium/drivers/d3d12/ci/gitlab-ci-inc.yml +++ b/src/gallium/drivers/d3d12/ci/gitlab-ci-inc.yml @@ -15,7 +15,7 @@ DRIVER_NAME: d3d12 WGL_DISABLE_ERROR_DIALOGS: "true" D3D12_AGILITY_RELATIVE_PATH: "D3D12\\" - D3D12_AGILITY_SDK_VERSION: 618 + D3D12_AGILITY_SDK_VERSION: 619 .d3d12-test-piglit: extends: diff --git a/src/microsoft/ci/gitlab-ci.yml b/src/microsoft/ci/gitlab-ci.yml index 5d313c140b2..73370eeecb6 100644 --- a/src/microsoft/ci/gitlab-ci.yml +++ b/src/microsoft/ci/gitlab-ci.yml @@ -38,7 +38,7 @@ test-dozen-deqp: variables: GIT_STRATEGY: none # testing doesn't build anything from source DZN_AGILITY_RELATIVE_PATH: "D3D12\\" - DZN_AGILITY_SDK_VERSION: 618 + DZN_AGILITY_SDK_VERSION: 619 DEQP_FRACTION: 4 script: - . _install/deqp_runner_run.ps1 diff --git a/subprojects/DirectX-Headers.wrap b/subprojects/DirectX-Headers.wrap index ec46fda801e..3ac408ecb53 100644 --- a/subprojects/DirectX-Headers.wrap +++ b/subprojects/DirectX-Headers.wrap @@ -2,5 +2,5 @@ directory = DirectX-Headers-1.0 url = https://github.com/microsoft/DirectX-Headers.git -revision = v1.618.1 +revision = v1.619.1 depth = 1