mirror of
https://gitlab.freedesktop.org/mesa/mesa.git
synced 2025-12-20 11:40:10 +01:00
CI/windows: Update headers and Agility redist to 1.710.0-preview
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22320>
This commit is contained in:
parent
5a29af262c
commit
24fce05f3f
5 changed files with 6 additions and 6 deletions
|
|
@ -27,7 +27,7 @@ variables:
|
||||||
WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"
|
WINDOWS_X64_VS_TAG: "2022-10-20-upgrade-zlib"
|
||||||
|
|
||||||
WINDOWS_X64_BUILD_PATH: "windows/x64_build"
|
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_PATH: "windows/x64_test"
|
||||||
WINDOWS_X64_TEST_TAG: "2023-03-20-warp-update"
|
WINDOWS_X64_TEST_TAG: "2023-04-05-agility-710"
|
||||||
|
|
|
||||||
|
|
@ -12,7 +12,7 @@ $depsInstallPath="C:\mesa-deps"
|
||||||
|
|
||||||
Get-Date
|
Get-Date
|
||||||
Write-Host "Cloning DirectX-Headers"
|
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 (!$?) {
|
if (!$?) {
|
||||||
Write-Host "Failed to clone DirectX-Headers repository"
|
Write-Host "Failed to clone DirectX-Headers repository"
|
||||||
Exit 1
|
Exit 1
|
||||||
|
|
|
||||||
|
|
@ -132,7 +132,7 @@ cargo install --git https://gitlab.freedesktop.org/anholt/deqp-runner.git
|
||||||
|
|
||||||
Get-Date
|
Get-Date
|
||||||
Write-Host "Downloading DirectX 12 Agility SDK"
|
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'
|
Expand-Archive -Path 'agility.zip' -DestinationPath 'C:\agility'
|
||||||
Remove-Item 'agility.zip'
|
Remove-Item 'agility.zip'
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,7 @@
|
||||||
GALLIUM_DRIVER: d3d12
|
GALLIUM_DRIVER: d3d12
|
||||||
WGL_DISABLE_ERROR_DIALOGS: "true"
|
WGL_DISABLE_ERROR_DIALOGS: "true"
|
||||||
D3D12_AGILITY_RELATIVE_PATH: "D3D12\\"
|
D3D12_AGILITY_RELATIVE_PATH: "D3D12\\"
|
||||||
D3D12_AGILITY_SDK_VERSION: 706
|
D3D12_AGILITY_SDK_VERSION: 710
|
||||||
|
|
||||||
.d3d12-test-piglit:
|
.d3d12-test-piglit:
|
||||||
extends:
|
extends:
|
||||||
|
|
|
||||||
|
|
@ -33,7 +33,7 @@ test-dozen-deqp:
|
||||||
variables:
|
variables:
|
||||||
GIT_STRATEGY: none # testing doesn't build anything from source
|
GIT_STRATEGY: none # testing doesn't build anything from source
|
||||||
DZN_AGILITY_RELATIVE_PATH: "D3D12\\"
|
DZN_AGILITY_RELATIVE_PATH: "D3D12\\"
|
||||||
DZN_AGILITY_SDK_VERSION: 706
|
DZN_AGILITY_SDK_VERSION: 710
|
||||||
script:
|
script:
|
||||||
- . _install/deqp_runner_run.ps1
|
- . _install/deqp_runner_run.ps1
|
||||||
artifacts:
|
artifacts:
|
||||||
|
|
|
||||||
Loading…
Add table
Reference in a new issue