fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2025-12-20 07:20:10 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

ci: Bump DirectX-Headers and Agility SDK dependencies to 1.618.1

Browse source 
Reviewed-by: Jesse Natalie <jenatali@microsoft.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/37581>
This commit is contained in:
Sil Vilerino 2025-09-12 09:18:02 -04:00 • committed by Silvio Vilerino
parent b5e856c6af
commit 0556fa09f0
8 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.gitlab-ci/container/build-directx-headers.sh
View file

@ -9,7 +9,7 @@ set -uex
uncollapsed_section_start directx-headers "Building directx-headers"
git clone https://github.com/microsoft/DirectX-Headers -b v1.614.1 --depth 1
git clone https://github.com/microsoft/DirectX-Headers -b v1.618.1 --depth 1
pushd DirectX-Headers
meson setup build --backend=ninja --buildtype=release -Dbuild-test=false ${EXTRA_MESON_ARGS:-}
meson install -C build

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

@ -20,7 +20,7 @@ include:
variables:
DEBIAN_BUILD_BASE_TAG: "20250926-gitlab"
DEBIAN_BUILD_TAG: "20250926-gitlab"
DEBIAN_BUILD_TAG: "20250926-D3D618"
DEBIAN_TEST_BASE_TAG: "20250926-gitlab"
DEBIAN_TEST_ANDROID_TAG: "20250926-gitlab"
@ -42,6 +42,6 @@ variables:
WINDOWS_X64_MSVC_TAG: "20250906-d3d10umd"
WINDOWS_X64_BUILD_TAG: "20250906-d3d10umd"
WINDOWS_X64_BUILD_TAG: "20251001-D3D618"
WINDOWS_X64_TEST_TAG: "20250906-d3d10umd"
WINDOWS_X64_TEST_TAG: "20250926-D3D618"

2
.gitlab-ci/windows/mesa_deps_build.ps1
View file

@ -12,7 +12,7 @@ $depsInstallPath="C:\mesa-deps"
Get-Date
Write-Host "Cloning DirectX-Headers"
git clone -b v1.614.1 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
git clone -b v1.618.1 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
if (!$?) {
Write-Host "Failed to clone DirectX-Headers repository"
Exit 1

2
.gitlab-ci/windows/mesa_deps_d3d.ps1
View file

@ -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.614.1 -OutFile 'agility.zip'
Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.618.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'

2
meson.build
View file

@ -610,7 +610,7 @@ if with_gallium_d3d12 or with_microsoft_clc or with_microsoft_vk or with_gfxstre
dep_dxheaders = dependency('directx-headers', required : false)
if not dep_dxheaders.found()
dep_dxheaders = dependency('DirectX-Headers',
version : '>= 1.614.1',
version : '>= 1.618.1',
fallback : ['DirectX-Headers', 'dep_dxheaders'],
required : with_gallium_d3d12 or with_microsoft_vk
)

2
src/gallium/drivers/d3d12/ci/gitlab-ci-inc.yml
View file

@ -16,7 +16,7 @@
DRIVER_NAME: d3d12
WGL_DISABLE_ERROR_DIALOGS: "true"
D3D12_AGILITY_RELATIVE_PATH: "D3D12\\"
D3D12_AGILITY_SDK_VERSION: 614
D3D12_AGILITY_SDK_VERSION: 618
.d3d12-test-piglit:
extends:

2
src/microsoft/ci/gitlab-ci.yml
View file

@ -40,7 +40,7 @@ test-dozen-deqp:
variables:
GIT_STRATEGY: none # testing doesn't build anything from source
DZN_AGILITY_RELATIVE_PATH: "D3D12\\"
DZN_AGILITY_SDK_VERSION: 614
DZN_AGILITY_SDK_VERSION: 618
DEQP_FRACTION: 4
script:
- . _install/deqp_runner_run.ps1

2
subprojects/DirectX-Headers.wrap
View file

@ -2,5 +2,5 @@
directory = DirectX-Headers-1.0
url = https://github.com/microsoft/DirectX-Headers.git
revision = v1.614.1
revision = v1.618.1
depth = 1