Module: Mesa Branch: main Commit: b0ba67144619613799ccf25fca95ccb55b825575 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b0ba67144619613799ccf25fca95ccb55b825575
Author: Jesse Natalie <jenat...@microsoft.com> Date: Mon Nov 13 16:38:45 2023 -0800 d3d12: Enable some 4.6 extensions that were already implemented Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/26210> --- src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt | 5 ++ .../drivers/d3d12/ci/d3d12-quick_shader.txt | 89 ++++++++++++++++++++++ src/gallium/drivers/d3d12/d3d12_screen.cpp | 7 +- 3 files changed, 99 insertions(+), 2 deletions(-) diff --git a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt index 129c8699a03..53d62ee2eae 100644 --- a/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt +++ b/src/gallium/drivers/d3d12/ci/d3d12-quick_gl.txt @@ -406,3 +406,8 @@ wgl@wgl-multi-context-single-window,Fail # remove this after https://gitlab.freedesktop.org/mesa/piglit/-/merge_requests/843 # is merged and piglit is updated spec@arb_vertex_program@arb_vertex_program-property-bindings,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 +spec@arb_gpu_shader5@arb_gpu_shader5-xfb-streams-without-invocations spirv,Fail diff --git a/src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt b/src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt index 26079ba27ab..eea2d0ac80d 100644 --- a/src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt +++ b/src/gallium/drivers/d3d12/ci/d3d12-quick_shader.txt @@ -53,3 +53,92 @@ 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 +spec@arb_gl_spirv@execution@ssbo@aoa,Fail +spec@arb_gl_spirv@execution@ssbo@aoa-2,Fail +spec@arb_gl_spirv@execution@ssbo@array,Fail +spec@arb_gl_spirv@execution@ssbo@array-indirect,Fail +spec@arb_gl_spirv@execution@ssbo@array-inside-ssbo,Fail +spec@arb_gl_spirv@execution@ssbo@array-of-arrays-inside-ssbo,Fail +spec@arb_gl_spirv@execution@ssbo@matrix@column-major,Fail +spec@arb_gl_spirv@execution@ssbo@matrix@column-vs-row,Fail +spec@arb_gl_spirv@execution@ssbo@matrix@complex,Fail +spec@arb_gl_spirv@execution@ssbo@matrix@indirect-column-major,Fail +spec@arb_gl_spirv@execution@ssbo@matrix@indirect-row-major,Fail +spec@arb_gl_spirv@execution@ssbo@matrix@row-major,Fail +spec@arb_gl_spirv@execution@ssbo@simple,Fail +spec@arb_gl_spirv@execution@ssbo@two-ssbo,Fail +spec@arb_gl_spirv@execution@ssbo@two-ssbo-different-layouts,Fail +spec@arb_gl_spirv@execution@ssbo@two-stages,Fail +spec@arb_gl_spirv@execution@ssbo@unsized-array,Fail +spec@arb_gl_spirv@execution@ssbo@unsized-array-length,Fail +spec@arb_gl_spirv@execution@ubo@aoa,Fail +spec@arb_gl_spirv@execution@ubo@aoa-2,Fail +spec@arb_gl_spirv@execution@ubo@array,Fail +spec@arb_gl_spirv@execution@ubo@array-complex,Fail +spec@arb_gl_spirv@execution@ubo@array-different-array-stride-ubo,Fail +spec@arb_gl_spirv@execution@ubo@array-indirect,Fail +spec@arb_gl_spirv@execution@ubo@array-inside-ubo,Fail +spec@arb_gl_spirv@execution@ubo@array-inside-ubo-copy,Fail +spec@arb_gl_spirv@execution@ubo@array-of-arrays-inside-ubo,Fail +spec@arb_gl_spirv@execution@ubo@explicit-offset,Fail +spec@arb_gl_spirv@execution@ubo@explicit-offset-nested-struct,Fail +spec@arb_gl_spirv@execution@ubo@location-0-crash,Fail +spec@arb_gl_spirv@execution@ubo@matrix@column-major,Fail +spec@arb_gl_spirv@execution@ubo@matrix@column-vs-row,Fail +spec@arb_gl_spirv@execution@ubo@matrix@complex,Fail +spec@arb_gl_spirv@execution@ubo@matrix@different-matrix-stride,Fail +spec@arb_gl_spirv@execution@ubo@matrix@indirect-column-major,Fail +spec@arb_gl_spirv@execution@ubo@matrix@indirect-row-major,Fail +spec@arb_gl_spirv@execution@ubo@matrix@row-major,Fail +spec@arb_gl_spirv@execution@ubo@simple,Fail +spec@arb_gl_spirv@execution@ubo@two-stages,Fail +spec@arb_gl_spirv@execution@ubo@two-ubos,Fail +spec@arb_gl_spirv@execution@uniform@array,Fail +spec@arb_gl_spirv@execution@uniform@arrays-of-arrays,Fail +spec@arb_gl_spirv@execution@uniform@atomic-uint-aoa-cs,Fail +spec@arb_gl_spirv@execution@uniform@atomic-uint-aoa-fs,Fail +spec@arb_gl_spirv@execution@uniform@atomic-uint-array-cs,Fail +spec@arb_gl_spirv@execution@uniform@atomic-uint-array-fs,Fail +spec@arb_gl_spirv@execution@uniform@atomic-uint-cs,Fail +spec@arb_gl_spirv@execution@uniform@atomic-uint-mixing-with-normal-uniforms,Fail +spec@arb_gl_spirv@execution@uniform@atomic-uint-several-slots,Fail +spec@arb_gl_spirv@execution@uniform@embedded-structs,Fail +spec@arb_gl_spirv@execution@uniform@index-matches-location,Fail +spec@arb_gl_spirv@execution@uniform@initializer,Fail +spec@arb_gl_spirv@execution@uniform@initializer-complex,Fail +spec@arb_gl_spirv@execution@uniform@initializer-dvec4,Fail +spec@arb_gl_spirv@execution@uniform@initializer-mat4x3,Fail +spec@arb_gl_spirv@execution@uniform@nonsequential-locations,Fail +spec@arb_gl_spirv@execution@uniform@sampler2d,Fail +spec@arb_gl_spirv@execution@uniform@sampler2d-binding,Fail +spec@arb_gl_spirv@execution@uniform@sampler2d-binding-array,Fail +spec@arb_gl_spirv@execution@uniform@sampler2d-nonconst-nested-array,Fail +spec@arb_gl_spirv@execution@uniform@sampler2d-struct,Fail +spec@arb_gl_spirv@execution@uniform@simple,Fail +spec@arb_gl_spirv@execution@uniform@simple-without-names,Fail +spec@arb_gl_spirv@execution@uniform@struct,Fail +spec@arb_gl_spirv@execution@uniform@struct-array,Fail +spec@arb_gl_spirv@execution@uniform@two-uniforms,Fail +spec@arb_gl_spirv@execution@va64-simple,Fail +spec@arb_gl_spirv@execution@vs-ps-simple,Fail +spec@arb_gl_spirv@execution@vs-ps-specializations,Fail +spec@arb_gl_spirv@execution@xfb@vs_aoa,Fail +spec@arb_gl_spirv@execution@xfb@vs_block,Fail +spec@arb_gl_spirv@execution@xfb@vs_block_array,Fail +spec@arb_gl_spirv@execution@xfb@vs_block_array_offset_per_member,Fail +spec@arb_gl_spirv@execution@xfb@vs_double,Fail +spec@arb_gl_spirv@execution@xfb@vs_lines,Fail +spec@arb_gl_spirv@execution@xfb@vs_simple,Fail +spec@arb_gl_spirv@execution@xfb@vs_simple_multiple_samples,Fail +spec@arb_gl_spirv@execution@xfb@vs_struct,Fail +spec@arb_gl_spirv@execution@xfb@vs_struct_array,Fail +spec@arb_gl_spirv@execution@xfb@vs_two_block,Fail +spec@arb_gl_spirv@execution@xfb@vs_two_sets,Fail +spec@arb_gl_spirv@execution@xfb@vs_two_sets_ifc,Fail +spec@arb_gl_spirv@execution@xfb@vs_two_sets_struct,Fail +spec@arb_gl_spirv@linker@uniform@multisampler,Fail +spec@arb_gl_spirv@linker@uniform@multisampler-array,Fail diff --git a/src/gallium/drivers/d3d12/d3d12_screen.cpp b/src/gallium/drivers/d3d12/d3d12_screen.cpp index 67dfcb1f404..99a084508be 100644 --- a/src/gallium/drivers/d3d12/d3d12_screen.cpp +++ b/src/gallium/drivers/d3d12/d3d12_screen.cpp @@ -193,9 +193,9 @@ d3d12_get_param(struct pipe_screen *pscreen, enum pipe_cap param) return 1; case PIPE_CAP_GLSL_FEATURE_LEVEL: - return 450; + return 460; case PIPE_CAP_GLSL_FEATURE_LEVEL_COMPATIBILITY: - return 450; + return 460; case PIPE_CAP_ESSL_FEATURE_LEVEL: return 310; @@ -340,6 +340,9 @@ d3d12_get_param(struct pipe_screen *pscreen, enum pipe_cap param) case PIPE_CAP_CULL_DISTANCE: case PIPE_CAP_TEXTURE_QUERY_SAMPLES: case PIPE_CAP_TEXTURE_BARRIER: + case PIPE_CAP_GL_SPIRV: + case PIPE_CAP_POLYGON_OFFSET_CLAMP: + case PIPE_CAP_SHADER_GROUP_VOTE: return 1; case PIPE_CAP_QUERY_BUFFER_OBJECT:
