Revert "ci/zink: Try to update TGL results for new MSAA behavior."

This reverts commit 74a8f118a2595479a94a8b7097680c5111d7273c.

This should have been in !22753.

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/22811>

diff --git a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
index a4715d7..4f42948 100644 (file)
--- a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
+++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt
@@ -1,4 +1,3 @@
-# https://gitlab.freedesktop.org/mesa/mesa/-/issues/8911
 multisample-dEQP-GLES3.functional.depth_stencil_clear.depth_scissored_masked,Fail
 multisample-dEQP-GLES3.functional.depth_stencil_clear.depth_scissored,Fail
 multisample-dEQP-GLES3.functional.depth_stencil_clear.depth_stencil_scissored,Fail
@@ -147,28 +146,6 @@ spec@!opengl 1.1@depthstencil-default_fb-blit samples=2,Fail
 spec@!opengl 1.1@depthstencil-default_fb-blit samples=6,Fail
 spec@!opengl 1.1@depthstencil-default_fb-blit samples=8,Fail
 
-# https://gitlab.freedesktop.org/mesa/mesa/-/issues/8911
-spec@!opengl 1.1@depthstencil-default_fb-copypixels samples=16,Fail
-spec@!opengl 1.1@depthstencil-default_fb-copypixels samples=2,Fail
-spec@!opengl 1.1@depthstencil-default_fb-copypixels samples=4,Fail
-spec@!opengl 1.1@depthstencil-default_fb-copypixels samples=6,Fail
-spec@!opengl 1.1@depthstencil-default_fb-copypixels samples=8,Fail
-spec@!opengl 1.1@depthstencil-default_fb-drawpixels-24_8 samples=16,Fail
-spec@!opengl 1.1@depthstencil-default_fb-drawpixels-24_8 samples=2,Fail
-spec@!opengl 1.1@depthstencil-default_fb-drawpixels-24_8 samples=4,Fail
-spec@!opengl 1.1@depthstencil-default_fb-drawpixels-24_8 samples=6,Fail
-spec@!opengl 1.1@depthstencil-default_fb-drawpixels-24_8 samples=8,Fail
-spec@!opengl 1.1@depthstencil-default_fb-drawpixels-32f_24_8_rev samples=16,Fail
-spec@!opengl 1.1@depthstencil-default_fb-drawpixels-32f_24_8_rev samples=2,Fail
-spec@!opengl 1.1@depthstencil-default_fb-drawpixels-32f_24_8_rev samples=4,Fail
-spec@!opengl 1.1@depthstencil-default_fb-drawpixels-32f_24_8_rev samples=6,Fail
-spec@!opengl 1.1@depthstencil-default_fb-drawpixels-32f_24_8_rev samples=8,Fail
-spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort samples=16,Crash
-spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort samples=2,Crash
-spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort samples=4,Crash
-spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort samples=6,Crash
-spec@!opengl 1.1@depthstencil-default_fb-drawpixels-float-and-ushort samples=8,Crash
-
 spec@!opengl 1.1@line-smooth-stipple,Fail
 
 spec@!opengl 1.1@polygon-mode-facing,Fail
@@ -519,90 +496,79 @@ spec@arb_sample_locations@test@MSAA: 8- X: 3- Y: 5- Grid: false,Fail
 spec@arb_sample_locations@test@MSAA: 8- X: 3- Y: 5- Grid: true,Fail
 spec@arb_sample_locations@test@MSAA: 8- X: 3- Y: 6- Grid: false,Fail
 spec@arb_sample_locations@test@MSAA: 8- X: 3- Y: 6- Grid: true,Fail
-
-spec@arb_sample_shading@samplemask 16 all,Crash
+spec@arb_sample_shading@samplemask 16 all,Fail
 spec@arb_sample_shading@samplemask 16 all@0.062500 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 16 all@0.125000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 16 all@0.250000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 16 all@0.500000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 16 all@1.000000 mask_in_one,Fail
-spec@arb_sample_shading@samplemask 16 all@noms fix,Fail
 spec@arb_sample_shading@samplemask 16 all@noms mask_in_one,Fail
 spec@arb_sample_shading@samplemask 16 all@noms partition,Fail
 spec@arb_sample_shading@samplemask 16 all@sample mask_in_one,Fail
-spec@arb_sample_shading@samplemask 16,Crash
+spec@arb_sample_shading@samplemask 16,Fail
 spec@arb_sample_shading@samplemask 16@0.062500 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 16@0.125000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 16@0.250000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 16@0.500000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 16@1.000000 mask_in_one,Fail
-spec@arb_sample_shading@samplemask 16@noms fix,Fail
 spec@arb_sample_shading@samplemask 16@noms mask_in_one,Fail
 spec@arb_sample_shading@samplemask 16@noms partition,Fail
 spec@arb_sample_shading@samplemask 16@sample mask_in_one,Fail
-spec@arb_sample_shading@samplemask 2 all,Crash
+spec@arb_sample_shading@samplemask 2 all,Fail
 spec@arb_sample_shading@samplemask 2 all@0.500000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 2 all@1.000000 mask_in_one,Fail
-spec@arb_sample_shading@samplemask 2 all@noms fix,Fail
 spec@arb_sample_shading@samplemask 2 all@noms mask_in_one,Fail
 spec@arb_sample_shading@samplemask 2 all@noms partition,Fail
 spec@arb_sample_shading@samplemask 2 all@sample mask_in_one,Fail
-spec@arb_sample_shading@samplemask 2,Crash
+spec@arb_sample_shading@samplemask 2,Fail
 spec@arb_sample_shading@samplemask 2@0.500000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 2@1.000000 mask_in_one,Fail
-spec@arb_sample_shading@samplemask 2@noms fix,Fail
 spec@arb_sample_shading@samplemask 2@noms mask_in_one,Fail
 spec@arb_sample_shading@samplemask 2@noms partition,Fail
 spec@arb_sample_shading@samplemask 2@sample mask_in_one,Fail
-spec@arb_sample_shading@samplemask 4 all,Crash
+spec@arb_sample_shading@samplemask 4 all,Fail
 spec@arb_sample_shading@samplemask 4 all@0.250000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 4 all@0.500000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 4 all@1.000000 mask_in_one,Fail
-spec@arb_sample_shading@samplemask 4 all@noms fix,Fail
 spec@arb_sample_shading@samplemask 4 all@noms mask_in_one,Fail
 spec@arb_sample_shading@samplemask 4 all@noms partition,Fail
 spec@arb_sample_shading@samplemask 4 all@sample mask_in_one,Fail
-spec@arb_sample_shading@samplemask 4,Crash
+spec@arb_sample_shading@samplemask 4,Fail
 spec@arb_sample_shading@samplemask 4@0.250000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 4@0.500000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 4@1.000000 mask_in_one,Fail
-spec@arb_sample_shading@samplemask 4@noms fix,Fail
 spec@arb_sample_shading@samplemask 4@noms mask_in_one,Fail
 spec@arb_sample_shading@samplemask 4@noms partition,Fail
 spec@arb_sample_shading@samplemask 4@sample mask_in_one,Fail
-spec@arb_sample_shading@samplemask 6 all,Crash
+spec@arb_sample_shading@samplemask 6 all,Fail
 spec@arb_sample_shading@samplemask 6 all@0.125000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 6 all@0.250000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 6 all@0.500000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 6 all@1.000000 mask_in_one,Fail
-spec@arb_sample_shading@samplemask 6 all@noms fix,Fail
 spec@arb_sample_shading@samplemask 6 all@noms mask_in_one,Fail
 spec@arb_sample_shading@samplemask 6 all@noms partition,Fail
 spec@arb_sample_shading@samplemask 6 all@sample mask_in_one,Fail
-spec@arb_sample_shading@samplemask 6,Crash
+spec@arb_sample_shading@samplemask 6,Fail
 spec@arb_sample_shading@samplemask 6@0.125000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 6@0.250000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 6@0.500000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 6@1.000000 mask_in_one,Fail
-spec@arb_sample_shading@samplemask 6@noms fix,Fail
 spec@arb_sample_shading@samplemask 6@noms mask_in_one,Fail
 spec@arb_sample_shading@samplemask 6@noms partition,Fail
 spec@arb_sample_shading@samplemask 6@sample mask_in_one,Fail
-spec@arb_sample_shading@samplemask 8 all,Crash
+spec@arb_sample_shading@samplemask 8 all,Fail
 spec@arb_sample_shading@samplemask 8 all@0.125000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 8 all@0.250000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 8 all@0.500000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 8 all@1.000000 mask_in_one,Fail
-spec@arb_sample_shading@samplemask 8 all@noms fix,Fail
 spec@arb_sample_shading@samplemask 8 all@noms mask_in_one,Fail
 spec@arb_sample_shading@samplemask 8 all@noms partition,Fail
 spec@arb_sample_shading@samplemask 8 all@sample mask_in_one,Fail
-spec@arb_sample_shading@samplemask 8,Crash
+spec@arb_sample_shading@samplemask 8,Fail
 spec@arb_sample_shading@samplemask 8@0.125000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 8@0.250000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 8@0.500000 mask_in_one,Fail
 spec@arb_sample_shading@samplemask 8@1.000000 mask_in_one,Fail
-spec@arb_sample_shading@samplemask 8@noms fix,Fail
 spec@arb_sample_shading@samplemask 8@noms mask_in_one,Fail
 spec@arb_sample_shading@samplemask 8@noms partition,Fail
 spec@arb_sample_shading@samplemask 8@sample mask_in_one,Fail
@@ -687,18 +653,6 @@ spec@arb_texture_buffer_object@formats (vs- arb)@GL_LUMINANCE8,Fail
 spec@arb_texture_buffer_object@formats (vs- arb)@GL_LUMINANCE8I_EXT,Fail
 spec@arb_texture_buffer_object@formats (vs- arb)@GL_LUMINANCE8UI_EXT,Fail
 
-# https://gitlab.freedesktop.org/mesa/mesa/-/issues/8911
-spec@arb_texture_cube_map@copyteximage cube samples=16,Crash
-spec@arb_texture_cube_map@copyteximage cube samples=2,Crash
-spec@arb_texture_cube_map@copyteximage cube samples=4,Crash
-spec@arb_texture_cube_map@copyteximage cube samples=6,Crash
-spec@arb_texture_cube_map@copyteximage cube samples=8,Crash
-spec@arb_texture_rectangle@copyteximage rect samples=16,Crash
-spec@arb_texture_rectangle@copyteximage rect samples=2,Crash
-spec@arb_texture_rectangle@copyteximage rect samples=4,Crash
-spec@arb_texture_rectangle@copyteximage rect samples=6,Crash
-spec@arb_texture_rectangle@copyteximage rect samples=8,Crash
-
 spec@egl 1.4@eglterminate then unbind context,Fail
 
 spec@egl_khr_gl_image@egl_khr_gl_renderbuffer_image-clear-shared-image gl_depth_component24,Fail
@@ -710,27 +664,32 @@ spec@egl_mesa_configless_context@basic,Fail
 # Fails across most drivers, but it's a silly test.
 spec@ext_framebuffer_blit@fbo-blit-check-limits,Fail
 
-# https://gitlab.freedesktop.org/mesa/mesa/-/issues/8911
-spec@ext_framebuffer_multisample@alpha-to-one-msaa-disabled 2,Crash
-spec@ext_framebuffer_multisample@alpha-to-one-msaa-disabled 6,Crash
-
 spec@ext_framebuffer_multisample@blit-mismatched-formats,Fail
 spec@ext_framebuffer_multisample@clip-and-scissor-blit 16 msaa,Fail
+spec@ext_framebuffer_multisample@enable-flag,Fail
+spec@ext_framebuffer_multisample@interpolation 16 centroid-deriv-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 16 centroid-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 16 non-centroid-deriv-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 16 non-centroid-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 2 centroid-deriv-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 2 centroid-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 2 non-centroid-deriv-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 2 non-centroid-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 4 centroid-deriv-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 4 centroid-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 4 non-centroid-deriv-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 4 non-centroid-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 6 centroid-deriv-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 6 centroid-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 6 non-centroid-deriv-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 6 non-centroid-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 8 centroid-deriv-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 8 centroid-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 8 non-centroid-deriv-disabled,Fail
+spec@ext_framebuffer_multisample@interpolation 8 non-centroid-disabled,Fail
 
 spec@ext_packed_float@query-rgba-signed-components,Fail
 
-# https://gitlab.freedesktop.org/mesa/mesa/-/issues/8911
-spec@ext_texture_array@copyteximage 1d_array samples=16,Crash
-spec@ext_texture_array@copyteximage 1d_array samples=2,Crash
-spec@ext_texture_array@copyteximage 1d_array samples=4,Crash
-spec@ext_texture_array@copyteximage 1d_array samples=6,Crash
-spec@ext_texture_array@copyteximage 1d_array samples=8,Crash
-spec@ext_texture_array@copyteximage 2d_array samples=16,Crash
-spec@ext_texture_array@copyteximage 2d_array samples=2,Crash
-spec@ext_texture_array@copyteximage 2d_array samples=4,Crash
-spec@ext_texture_array@copyteximage 2d_array samples=6,Crash
-spec@ext_texture_array@copyteximage 2d_array samples=8,Crash
-
 spec@ext_transform_feedback@tessellation triangle_fan flat_first,Fail
 spec@ext_transform_feedback@tessellation quad_strip wireframe,Fail
 spec@ext_transform_feedback@tessellation quads wireframe,Fail