mirrors
/
mesa
mirror of https://gitlab.freedesktop.org/mesa/mesa
1
0
Fork 0
Code Issues 9 Packages Projects Releases Wiki Activity

ci/windows: Update DirectX-Headers, Agility SDK, zlib, DXC, and WARP 

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/28339>
This commit is contained in:
Jesse Natalie 2024-03-22 09:21:55 -07:00 committed by Marge Bot
parent 267ae85a72
commit ff802ca93b
6 changed files with 12 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitlab-ci/image-tags.yml
View File

@ -40,7 +40,7 @@ variables:
WINDOWS_X64_MSVC_TAG: "20231222-msvc"
WINDOWS_X64_BUILD_PATH: "windows/x86_64_build"
WINDOWS_X64_BUILD_TAG: "20240117-vulkan-sdk"
WINDOWS_X64_BUILD_TAG: "20240322-agility-sdk"
WINDOWS_X64_TEST_PATH: "windows/x86_64_test"
WINDOWS_X64_TEST_TAG: "20240117-vulkan-sdk"
WINDOWS_X64_TEST_TAG: "20240322-agility-sdk"

9
.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.611.0 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
git clone -b v1.613.1 --depth=1 https://github.com/microsoft/DirectX-Headers deps/DirectX-Headers
if (!$?) {
Write-Host "Failed to clone DirectX-Headers repository"
Exit 1
@ -32,16 +32,17 @@ if (!$buildstatus) {
Get-Date
Write-Host "Cloning zlib"
git clone -b v1.2.13 --depth=1 https://github.com/madler/zlib deps/zlib
git clone -b v1.3.1 --depth=1 https://github.com/madler/zlib deps/zlib
if (!$?) {
Write-Host "Failed to clone zlib repository"
Exit 1
}
Write-Host "Downloading zlib meson build files"
Invoke-WebRequest -Uri "https://wrapdb.mesonbuild.com/v2/zlib_1.2.13-1/get_patch" -OutFile deps/zlib.zip
Invoke-WebRequest -Uri "https://wrapdb.mesonbuild.com/v2/zlib_1.3.1-1/get_patch" -OutFile deps/zlib.zip
Expand-Archive -Path deps/zlib.zip -Destination deps/zlib
# Wrap archive puts build files in a version subdir
Move-Item deps/zlib/zlib-1.2.13/* deps/zlib
robocopy deps/zlib/zlib-1.3.1 deps/zlib /E
Remove-Item -Recurse -Force -ErrorAction SilentlyContinue -Path deps/zlib/zlib-1.3.1
$zlib_build = New-Item -ItemType Directory -Path ".\deps\zlib" -Name "build"
Push-Location -Path $zlib_build.FullName
meson .. --backend=ninja -Dprefix="$depsInstallPath" --default-library=static --buildtype=release -Db_vscrt=mt && `

6
.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.610.2 -OutFile 'agility.zip'
Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.D3D12/1.613.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'
@ -18,7 +18,7 @@ Remove-Item -Recurse 'C:\agility'
Write-Host "Downloading Updated WARP at:"
Get-Date
Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/1.0.9 -OutFile 'warp.zip'
Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/1.0.11 -OutFile 'warp.zip'
Expand-Archive -Path 'warp.zip' -DestinationPath 'C:\warp'
# Copy WARP into mesa-deps\bin
Copy-Item 'C:\warp\build\native\amd64\d3d10warp.dll' -Destination $depsInstallPath\bin
@ -27,7 +27,7 @@ Remove-Item -Recurse 'C:\warp'
Write-Host "Downloading DirectXShaderCompiler release at:"
Get-Date
Invoke-WebRequest -Uri https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.7.2207/dxc_2022_07_18.zip -OutFile 'DXC.zip'
Invoke-WebRequest -Uri https://github.com/microsoft/DirectXShaderCompiler/releases/download/v1.8.2403/dxc_2024_03_07.zip -OutFile 'DXC.zip'
Expand-Archive -Path 'DXC.zip' -DestinationPath 'C:\DXC'
# No more need to get dxil.dll from the VS install
Copy-Item 'C:\DXC\bin\x64\*.dll' -Destination 'C:\Windows\System32'

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

@ -14,7 +14,7 @@
GALLIUM_DRIVER: d3d12
WGL_DISABLE_ERROR_DIALOGS: "true"
D3D12_AGILITY_RELATIVE_PATH: "D3D12\\"
D3D12_AGILITY_SDK_VERSION: 610
D3D12_AGILITY_SDK_VERSION: 613
.d3d12-test-piglit:
extends:

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

@ -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: 610
DZN_AGILITY_SDK_VERSION: 613
DEQP_FRACTION: 4
script:
- . _install/deqp_runner_run.ps1

39
src/microsoft/ci/warp-fails.txt
View File

@ -1,39 +0,0 @@
# DXIL does not have a way to express these yet. Hopefully incoming with shader model 6.8
# See https://github.com/microsoft/hlsl-specs/issues/30
dEQP-VK.glsl.texture_functions.texture.sampler1darrayshadow_bias_fragment,Fail
dEQP-VK.glsl.texture_functions.texture.sampler1dshadow_bias_fragment,Fail
dEQP-VK.glsl.texture_functions.texture.sampler2dshadow_bias_fragment,Fail
dEQP-VK.glsl.texture_functions.texture.samplercubeshadow_bias_fragment,Fail
dEQP-VK.glsl.texture_functions.texturegrad.sampler1darrayshadow_fragment,Fail
dEQP-VK.glsl.texture_functions.texturegrad.sampler1darrayshadow_vertex,Fail
dEQP-VK.glsl.texture_functions.texturegrad.sampler1dshadow_fragment,Fail
dEQP-VK.glsl.texture_functions.texturegrad.sampler1dshadow_vertex,Fail
dEQP-VK.glsl.texture_functions.texturegrad.sampler2darrayshadow_fragment,Fail
dEQP-VK.glsl.texture_functions.texturegrad.sampler2darrayshadow_vertex,Fail
dEQP-VK.glsl.texture_functions.texturegrad.sampler2dshadow_fragment,Fail
dEQP-VK.glsl.texture_functions.texturegrad.sampler2dshadow_vertex,Fail
dEQP-VK.glsl.texture_functions.texturegrad.samplercubeshadow_fragment,Fail
dEQP-VK.glsl.texture_functions.texturegrad.samplercubeshadow_vertex,Fail
dEQP-VK.glsl.texture_functions.texturegradoffset.sampler1darrayshadow_fragment,Fail
dEQP-VK.glsl.texture_functions.texturegradoffset.sampler1darrayshadow_vertex,Fail
dEQP-VK.glsl.texture_functions.texturegradoffset.sampler1dshadow_fragment,Fail
dEQP-VK.glsl.texture_functions.texturegradoffset.sampler1dshadow_vertex,Fail
dEQP-VK.glsl.texture_functions.texturegradoffset.sampler2darrayshadow_fragment,Fail
dEQP-VK.glsl.texture_functions.texturegradoffset.sampler2darrayshadow_vertex,Fail
dEQP-VK.glsl.texture_functions.texturegradoffset.sampler2dshadow_fragment,Fail
dEQP-VK.glsl.texture_functions.texturegradoffset.sampler2dshadow_vertex,Fail
dEQP-VK.glsl.texture_functions.textureoffset.sampler1darrayshadow_bias_fragment,Fail
dEQP-VK.glsl.texture_functions.textureoffset.sampler1dshadow_bias_fragment,Fail
dEQP-VK.glsl.texture_functions.textureoffset.sampler2dshadow_bias_fragment,Fail
dEQP-VK.glsl.texture_functions.textureproj.sampler1dshadow_bias_fragment,Fail
dEQP-VK.glsl.texture_functions.textureproj.sampler2dshadow_bias_fragment,Fail
dEQP-VK.glsl.texture_functions.textureprojgrad.sampler1dshadow_fragment,Fail
dEQP-VK.glsl.texture_functions.textureprojgrad.sampler1dshadow_vertex,Fail
dEQP-VK.glsl.texture_functions.textureprojgrad.sampler2dshadow_fragment,Fail
dEQP-VK.glsl.texture_functions.textureprojgrad.sampler2dshadow_vertex,Fail
dEQP-VK.glsl.texture_functions.textureprojgradoffset.sampler1dshadow_fragment,Fail
dEQP-VK.glsl.texture_functions.textureprojgradoffset.sampler1dshadow_vertex,Fail
dEQP-VK.glsl.texture_functions.textureprojgradoffset.sampler2dshadow_fragment,Fail
dEQP-VK.glsl.texture_functions.textureprojgradoffset.sampler2dshadow_vertex,Fail
dEQP-VK.glsl.texture_functions.textureprojoffset.sampler1dshadow_bias_fragment,Fail
dEQP-VK.glsl.texture_functions.textureprojoffset.sampler2dshadow_bias_fragment,Fail