mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2024-11-23 02:04:41 +08:00
ci: Bump DirectX-Headers and Agility SDK dependencies to 1.614.1
Reviewed-By: Jesse Natalie <jenatali@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/31092>
This commit is contained in:
parent
8338e2082e
commit
702bd657cc
@ -7,7 +7,7 @@
|
||||
|
||||
set -ex
|
||||
|
||||
git clone https://github.com/microsoft/DirectX-Headers -b v1.613.1 --depth 1
|
||||
git clone https://github.com/microsoft/DirectX-Headers -b v1.614.1 --depth 1
|
||||
pushd DirectX-Headers
|
||||
meson setup build --backend=ninja --buildtype=release -Dbuild-test=false $EXTRA_MESON_ARGS
|
||||
meson install -C build
|
||||
|
@ -16,7 +16,7 @@ variables:
|
||||
DEBIAN_BASE_TAG: "20240729-rustc-bump"
|
||||
|
||||
DEBIAN_X86_64_BUILD_IMAGE_PATH: "debian/x86_64_build"
|
||||
DEBIAN_BUILD_TAG: "20240909-pytest"
|
||||
DEBIAN_BUILD_TAG: "20240910-SDK614"
|
||||
|
||||
DEBIAN_X86_64_TEST_BASE_IMAGE: "debian/x86_64_test-base"
|
||||
DEBIAN_ARM64_TEST_BASE_IMAGE: "debian/arm64_test-base"
|
||||
@ -43,7 +43,7 @@ variables:
|
||||
WINDOWS_X64_MSVC_TAG: "20240827-v143"
|
||||
|
||||
WINDOWS_X64_BUILD_PATH: "windows/x86_64_build"
|
||||
WINDOWS_X64_BUILD_TAG: "20240827-v143"
|
||||
WINDOWS_X64_BUILD_TAG: "20240910-SDK614"
|
||||
|
||||
WINDOWS_X64_TEST_PATH: "windows/x86_64_test"
|
||||
WINDOWS_X64_TEST_TAG: "20240827-v143"
|
||||
WINDOWS_X64_TEST_TAG: "20240910-SDK614"
|
||||
|
@ -12,7 +12,7 @@ $depsInstallPath="C:\mesa-deps"
|
||||
|
||||
Get-Date
|
||||
Write-Host "Cloning DirectX-Headers"
|
||||
git clone -b v1.613.1 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
|
||||
git clone -b v1.614.1 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
|
||||
if (!$?) {
|
||||
Write-Host "Failed to clone DirectX-Headers repository"
|
||||
Exit 1
|
||||
|
@ -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.613.2 -OutFile 'agility.zip'
|
||||
Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.614.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'
|
||||
|
@ -580,7 +580,7 @@ if with_gallium_d3d12 or with_microsoft_clc or with_microsoft_vk
|
||||
dep_dxheaders = dependency('directx-headers', required : false)
|
||||
if not dep_dxheaders.found()
|
||||
dep_dxheaders = dependency('DirectX-Headers',
|
||||
version : '>= 1.613.0',
|
||||
version : '>= 1.614.1',
|
||||
fallback : ['DirectX-Headers', 'dep_dxheaders'],
|
||||
required : with_gallium_d3d12 or with_microsoft_vk
|
||||
)
|
||||
|
@ -14,7 +14,7 @@
|
||||
GALLIUM_DRIVER: d3d12
|
||||
WGL_DISABLE_ERROR_DIALOGS: "true"
|
||||
D3D12_AGILITY_RELATIVE_PATH: "D3D12\\"
|
||||
D3D12_AGILITY_SDK_VERSION: 613
|
||||
D3D12_AGILITY_SDK_VERSION: 614
|
||||
|
||||
.d3d12-test-piglit:
|
||||
extends:
|
||||
|
@ -36,7 +36,7 @@ test-dozen-deqp:
|
||||
variables:
|
||||
GIT_STRATEGY: none # testing doesn't build anything from source
|
||||
DZN_AGILITY_RELATIVE_PATH: "D3D12\\"
|
||||
DZN_AGILITY_SDK_VERSION: 613
|
||||
DZN_AGILITY_SDK_VERSION: 614
|
||||
DEQP_FRACTION: 4
|
||||
script:
|
||||
- . _install/deqp_runner_run.ps1
|
||||
|
@ -2,5 +2,5 @@
|
||||
directory = DirectX-Headers-1.0
|
||||
|
||||
url = https://github.com/microsoft/DirectX-Headers.git
|
||||
revision = v1.613.1
|
||||
revision = v1.614.1
|
||||
depth = 1
|
||||
|
Loading…
Reference in New Issue
Block a user