Module: Mesa Branch: main Commit: bc65d14ddb946a77d075fb29536bb29739271c97 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=bc65d14ddb946a77d075fb29536bb29739271c97
Author: Jesse Natalie <jenat...@microsoft.com> Date: Wed Jan 10 17:07:42 2024 -0800 ci/windows: Update WARP to 1.0.9 NuGet Reviewed-by: Sil Vilerino <sivil...@microsoft.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26992> --- .gitlab-ci/image-tags.yml | 2 +- .gitlab-ci/windows/mesa_deps_d3d.ps1 | 2 +- src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt | 12 ------------ src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt | 5 ----- 4 files changed, 2 insertions(+), 19 deletions(-) diff --git a/.gitlab-ci/image-tags.yml b/.gitlab-ci/image-tags.yml index 1c397dff1e2..fe55edf7213 100644 --- a/.gitlab-ci/image-tags.yml +++ b/.gitlab-ci/image-tags.yml @@ -37,4 +37,4 @@ variables: WINDOWS_X64_BUILD_TAG: "2023-12-22-msvc" WINDOWS_X64_TEST_PATH: "windows/x86_64_test" - WINDOWS_X64_TEST_TAG: "2023-12-22-msvc" + WINDOWS_X64_TEST_TAG: "2024-01-10-warp" diff --git a/.gitlab-ci/windows/mesa_deps_d3d.ps1 b/.gitlab-ci/windows/mesa_deps_d3d.ps1 index 59e73f611ec..220f866fde4 100644 --- a/.gitlab-ci/windows/mesa_deps_d3d.ps1 +++ b/.gitlab-ci/windows/mesa_deps_d3d.ps1 @@ -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.7.1 -OutFile 'warp.zip' +Invoke-WebRequest -Uri https://www.nuget.org/api/v2/package/Microsoft.Direct3D.WARP/1.0.9 -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 diff --git a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt index 6e4247185b5..53d62ee2eae 100644 --- a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt +++ b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt @@ -411,15 +411,3 @@ spec@arb_vertex_program@arb_vertex_program-property-bindings,Fail # https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/850, # and CI changes to glue them together spec@arb_gpu_shader5@arb_gpu_shader5-xfb-streams-without-invocations spirv,Fail - -# WARP bug: submitting an indirect draw with a count buffer modifies the arg buffer to zero -# entries between >= dynamic count and < static max count -spec@arb_query_buffer_object@coherency,Fail -spec@arb_query_buffer_object@coherency@indirect-draw-count-GL_FRAGMENT_SHADER_INVOCATIONS,Fail -spec@arb_query_buffer_object@coherency@indirect-draw-count-GL_PRIMITIVES_GENERATED,Fail -spec@arb_query_buffer_object@coherency@indirect-draw-count-GL_PRIMITIVES_SUBMITTED,Fail -spec@arb_query_buffer_object@coherency@indirect-draw-count-GL_SAMPLES_PASSED,Fail -spec@arb_query_buffer_object@coherency@indirect-draw-count-GL_TIMESTAMP,Fail -spec@arb_query_buffer_object@coherency@indirect-draw-count-GL_TIME_ELAPSED,Fail -spec@arb_query_buffer_object@coherency@indirect-draw-count-GL_VERTEX_SHADER_INVOCATIONS,Fail -spec@arb_query_buffer_object@coherency@indirect-draw-count-GL_VERTICES_SUBMITTED,Fail diff --git a/src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt b/src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt index eea2d0ac80d..7256d99e2da 100644 --- a/src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt +++ b/src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt @@ -1,7 +1,6 @@ spec@arb_gpu_shader_int64@execution@indirect-array-two-accesses,Fail spec@arb_separate_shader_objects@execution@layout-location-block-with-struct-member,Crash spec@arb_separate_shader_objects@execution@layout-location-struct-mixed-with-implicitly-assigned-varying,Crash -spec@arb_shader_storage_buffer_object@execution@ssbo-atomiccompswap-int,Fail spec@arb_shader_texture_lod@execution@glsl-fs-shadow2dgradarb-07,Fail spec@arb_shader_texture_lod@execution@glsl-fs-shadow2dgradarb-cumulative,Fail spec@arb_tessellation_shader@execution@dmat-vs-gs-tcs-tes,Fail @@ -50,10 +49,6 @@ spec@arb_enhanced_layouts@execution@component-layout@vs-fs-array-dvec3,Crash spec@arb_enhanced_layouts@execution@component-layout@vs-gs-fs-double,Fail spec@arb_tessellation_shader@execution@dvec3-vs-tcs-tes,Fail -# WARP bug: Due to SIMT, the FS loop runs 4 times, and all 4 threads end up with -# the final value from the SSBO instead of remembering their own value they computed. -spec@glsl-4.50@execution@ssbo-atomiccompswap-int,Fail - # Needs https://github.com/KhronosGroup/SPIRV-Tools/pull/5477, # https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/850, # and CI changes to glue them together
