diff --git a/.gitlab-ci/deqp-runner.sh b/.gitlab-ci/deqp-runner.sh index 33368c9503e..7a34553089b 100755 --- a/.gitlab-ci/deqp-runner.sh +++ b/.gitlab-ci/deqp-runner.sh @@ -120,6 +120,10 @@ if [ "$PIGLIT_PLATFORM" != "gbm" ] ; then DEQP_SKIPS="$DEQP_SKIPS $INSTALL/x11-skips.txt" fi +if [ "$PIGLIT_PLATFORM" = "gbm" ]; then + DEQP_SKIPS="$DEQP_SKIPS $INSTALL/gbm-skips.txt" +fi + report_load() { echo "System load: $(cut -d' ' -f1-3 < /proc/loadavg)" echo "# of CPU cores: $(cat /proc/cpuinfo | grep processor | wc -l)" diff --git a/.gitlab-ci/gbm-skips.txt b/.gitlab-ci/gbm-skips.txt new file mode 100644 index 00000000000..9067df7e8f5 --- /dev/null +++ b/.gitlab-ci/gbm-skips.txt @@ -0,0 +1,7 @@ +# gbm does not support reading the front buffer after a swapbuffers, and that's +# intentional. Don't bother running these tests when PIGLIT_PLATFORM=gbm. +# +# Note that this doesn't include tests like fbo-sys-blit, which draw/read front +# but don't swap. +spec@!opengl 1.0@gl-1.0-swapbuffers-behavior +spec@!opengl 1.1@read-front diff --git a/.gitlab-ci/piglit/piglit-runner.sh b/.gitlab-ci/piglit/piglit-runner.sh index db3d30ec28d..0a98e72856e 100755 --- a/.gitlab-ci/piglit/piglit-runner.sh +++ b/.gitlab-ci/piglit/piglit-runner.sh @@ -80,6 +80,10 @@ if [ "$PIGLIT_PLATFORM" != "gbm" ] ; then PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/x11-skips.txt" fi +if [ "$PIGLIT_PLATFORM" = "gbm" ]; then + PIGLIT_SKIPS="$PIGLIT_SKIPS $INSTALL/gbm-skips.txt" +fi + set +e piglit-runner \ diff --git a/src/etnaviv/ci/etnaviv-gc2000-fails.txt b/src/etnaviv/ci/etnaviv-gc2000-fails.txt index d679135c6fb..40557848bdb 100644 --- a/src/etnaviv/ci/etnaviv-gc2000-fails.txt +++ b/src/etnaviv/ci/etnaviv-gc2000-fails.txt @@ -1914,8 +1914,6 @@ spec@!opengl 1.1@polygon-mode-offset@config 6: Expected white pixel on right edg spec@!opengl 1.1@polygon-mode-offset@config 6: Expected white pixel on top edge,Fail spec@!opengl 1.1@polygon-mode-offset,Fail spec@!opengl 1.1@polygon-offset,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail -spec@!opengl 1.1@read-front,Fail spec@!opengl 1.1@streaming-texture-leak,Timeout spec@!opengl 1.1@texwrap 1d bordercolor,Fail spec@!opengl 1.1@texwrap 1d bordercolor@GL_RGBA8- border color only,Fail diff --git a/src/gallium/drivers/crocus/ci/crocus-g41-fails.txt b/src/gallium/drivers/crocus/ci/crocus-g41-fails.txt index 230a6ad45ef..9f2416fbb48 100644 --- a/src/gallium/drivers/crocus/ci/crocus-g41-fails.txt +++ b/src/gallium/drivers/crocus/ci/crocus-g41-fails.txt @@ -73,8 +73,6 @@ shaders@glsl-routing,Crash # frontbuffer reading failures? spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail -spec@!opengl 1.1@read-front,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail spec@!opengl 1.1@line-aa-width,Fail spec@!opengl 1.1@linestipple,Fail diff --git a/src/gallium/drivers/crocus/ci/crocus-hsw-fails.txt b/src/gallium/drivers/crocus/ci/crocus-hsw-fails.txt index 6cd9c4d378a..99e4785ef7a 100644 --- a/src/gallium/drivers/crocus/ci/crocus-hsw-fails.txt +++ b/src/gallium/drivers/crocus/ci/crocus-hsw-fails.txt @@ -3,18 +3,6 @@ spec@!opengl 1.0@depth-clear-precision-check@depth16,Fail spec@!opengl 1.0@depth-clear-precision-check@depth32,Fail spec@!opengl 1.0@depth-clear-precision-check@depth32f_stencil8,Fail -# frontbuffer reading failures? -spec@!opengl 1.1@read-front,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail -spec@!opengl 1.1@read-front clear-front-first samples=2,Fail -spec@!opengl 1.1@read-front clear-front-first samples=4,Fail -spec@!opengl 1.1@read-front clear-front-first samples=6,Fail -spec@!opengl 1.1@read-front clear-front-first samples=8,Fail -spec@!opengl 1.1@read-front samples=2,Fail -spec@!opengl 1.1@read-front samples=4,Fail -spec@!opengl 1.1@read-front samples=6,Fail -spec@!opengl 1.1@read-front samples=8,Fail - fast_color_clear@fcc-write-after-clear,Fail spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail diff --git a/src/gallium/drivers/i915/ci/i915-g33-fails.txt b/src/gallium/drivers/i915/ci/i915-g33-fails.txt index 39244672a50..caa0ea55084 100644 --- a/src/gallium/drivers/i915/ci/i915-g33-fails.txt +++ b/src/gallium/drivers/i915/ci/i915-g33-fails.txt @@ -215,8 +215,6 @@ spec@!opengl 1.1@polygon-mode-offset@config 4: Expected white pixel on bottom ed spec@!opengl 1.1@polygon-mode-offset@config 4: Expected white pixel on left edge,Fail spec@!opengl 1.1@polygon-mode-offset@config 4: Expected white pixel on right edge,Fail spec@!opengl 1.1@polygon-mode-offset@config 4: Expected white pixel on top edge,Fail -spec@!opengl 1.1@read-front,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail # https://gitlab.freedesktop.org/mesa/mesa/-/issues/4985 spec@!opengl 1.1@texwrap 1d bordercolor,Fail diff --git a/src/gallium/drivers/lima/ci/lima-fails.txt b/src/gallium/drivers/lima/ci/lima-fails.txt index e92c496ff76..c82a9e70db5 100644 --- a/src/gallium/drivers/lima/ci/lima-fails.txt +++ b/src/gallium/drivers/lima/ci/lima-fails.txt @@ -613,12 +613,6 @@ spec@!opengl 1.1@polygon-mode-offset@config 6: Expected blue pixel in center,Fai spec@!opengl 1.1@polygon-mode-offset@config 6: Expected white pixel on right edge,Fail spec@!opengl 1.1@polygon-mode-offset@config 6: Expected white pixel on top edge,Fail spec@!opengl 1.1@polygon-mode-offset,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail -spec@!opengl 1.1@read-front clear-front-first samples=2,Fail -spec@!opengl 1.1@read-front clear-front-first samples=4,Fail -spec@!opengl 1.1@read-front,Fail -spec@!opengl 1.1@read-front samples=2,Fail -spec@!opengl 1.1@read-front samples=4,Fail spec@!opengl 1.1@teximage-scale-bias,Fail spec@!opengl 1.1@texsubimage,Fail spec@!opengl 1.1@texsubimage-unpack,Fail diff --git a/src/gallium/drivers/nouveau/ci/nouveau-gm206-fails.txt b/src/gallium/drivers/nouveau/ci/nouveau-gm206-fails.txt index 7457cf615ff..31f381f9e96 100644 --- a/src/gallium/drivers/nouveau/ci/nouveau-gm206-fails.txt +++ b/src/gallium/drivers/nouveau/ci/nouveau-gm206-fails.txt @@ -120,16 +120,6 @@ spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=4,F spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=6,Fail spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=8,Fail spec@!opengl 1.1@getteximage-formats,Fail -spec@!opengl 1.1@read-front,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail -spec@!opengl 1.1@read-front clear-front-first samples=2,Fail -spec@!opengl 1.1@read-front clear-front-first samples=4,Fail -spec@!opengl 1.1@read-front clear-front-first samples=6,Fail -spec@!opengl 1.1@read-front clear-front-first samples=8,Fail -spec@!opengl 1.1@read-front samples=2,Fail -spec@!opengl 1.1@read-front samples=4,Fail -spec@!opengl 1.1@read-front samples=6,Fail -spec@!opengl 1.1@read-front samples=8,Fail spec@!opengl 1.2@getteximage-targets 3d,Fail spec@!opengl 3.1@vao-broken-attrib,Crash spec@!opengl 3.2@gl-3.2-adj-prims cull-back pv-first,Fail diff --git a/src/gallium/drivers/nouveau/ci/nouveau-nv92-fails.txt b/src/gallium/drivers/nouveau/ci/nouveau-nv92-fails.txt index 7412f5e2385..29f0784e995 100644 --- a/src/gallium/drivers/nouveau/ci/nouveau-nv92-fails.txt +++ b/src/gallium/drivers/nouveau/ci/nouveau-nv92-fails.txt @@ -463,17 +463,6 @@ spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=4,F spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=6,Fail spec@!opengl 1.1@depthstencil-default_fb-readpixels-float-and-ushort samples=8,Fail -spec@!opengl 1.1@read-front,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail -spec@!opengl 1.1@read-front clear-front-first samples=2,Fail -spec@!opengl 1.1@read-front clear-front-first samples=4,Fail -spec@!opengl 1.1@read-front clear-front-first samples=6,Fail -spec@!opengl 1.1@read-front clear-front-first samples=8,Fail -spec@!opengl 1.1@read-front samples=2,Fail -spec@!opengl 1.1@read-front samples=4,Fail -spec@!opengl 1.1@read-front samples=6,Fail -spec@!opengl 1.1@read-front samples=8,Fail - spec@!opengl 2.0@gl-2.0-edgeflag,Fail spec@!opengl 2.0@gl-2.0-edgeflag-immediate,Fail spec@!opengl 3.0@minmax,Fail diff --git a/src/gallium/drivers/r600/ci/r600-rv770-fails.txt b/src/gallium/drivers/r600/ci/r600-rv770-fails.txt index 6e0fd3b7f6a..22249de873a 100644 --- a/src/gallium/drivers/r600/ci/r600-rv770-fails.txt +++ b/src/gallium/drivers/r600/ci/r600-rv770-fails.txt @@ -402,17 +402,6 @@ spec@!opengl 1.1@linestipple@Factor 2x,Fail spec@!opengl 1.1@linestipple@Factor 3x,Fail spec@!opengl 1.1@linestipple@Line loop,Fail -spec@!opengl 1.1@read-front,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail -spec@!opengl 1.1@read-front clear-front-first samples=2,Fail -spec@!opengl 1.1@read-front clear-front-first samples=4,Fail -spec@!opengl 1.1@read-front clear-front-first samples=6,Fail -spec@!opengl 1.1@read-front clear-front-first samples=8,Fail -spec@!opengl 1.1@read-front samples=2,Fail -spec@!opengl 1.1@read-front samples=4,Fail -spec@!opengl 1.1@read-front samples=6,Fail -spec@!opengl 1.1@read-front samples=8,Fail - spec@!opengl 1.1@teximage-colors gl_sluminance8,Fail spec@!opengl 1.1@teximage-colors gl_sluminance8@GL_SLUMINANCE8 texture with GL_ABGR_EXT and GL_BYTE,Fail spec@!opengl 1.1@teximage-colors gl_sluminance8@GL_SLUMINANCE8 texture with GL_ABGR_EXT and GL_FLOAT,Fail diff --git a/src/gallium/drivers/r600/ci/r600-turks-fails.txt b/src/gallium/drivers/r600/ci/r600-turks-fails.txt index 1944cd15ace..0f82bd1f435 100644 --- a/src/gallium/drivers/r600/ci/r600-turks-fails.txt +++ b/src/gallium/drivers/r600/ci/r600-turks-fails.txt @@ -1497,19 +1497,6 @@ spec@!opengl 1.1@linestipple@Factor 2x,Fail spec@!opengl 1.1@linestipple@Factor 3x,Fail spec@!opengl 1.1@linestipple@Line loop,Fail -# GBM front read failures -spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail -spec@!opengl 1.1@read-front,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail -spec@!opengl 1.1@read-front clear-front-first samples=2,Fail -spec@!opengl 1.1@read-front clear-front-first samples=4,Fail -spec@!opengl 1.1@read-front clear-front-first samples=6,Fail -spec@!opengl 1.1@read-front clear-front-first samples=8,Fail -spec@!opengl 1.1@read-front samples=2,Fail -spec@!opengl 1.1@read-front samples=4,Fail -spec@!opengl 1.1@read-front samples=6,Fail -spec@!opengl 1.1@read-front samples=8,Fail - spec@!opengl 1.1@texwrap formats bordercolor-swizzled,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGB10- swizzled- border color only,Fail spec@!opengl 1.1@texwrap formats bordercolor-swizzled@GL_RGB10_A2- swizzled- border color only,Fail 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 c214133d6be..6e1f0a6c96d 100644 --- a/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-anv-tgl-fails.txt @@ -258,14 +258,6 @@ spec@!opengl 1.1@linestipple,Fail # (and more) spec@!opengl 1.1@polygon-mode,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail -spec@!opengl 1.1@read-front samples=16,Fail -spec@!opengl 1.1@read-front samples=2,Fail -spec@!opengl 1.1@read-front samples=4,Fail -spec@!opengl 1.1@read-front samples=6,Fail -spec@!opengl 1.1@read-front samples=8,Fail -spec@!opengl 1.1@read-front,Fail - # depth texturing: zink is returning intensity shadow comparisons and depth samples, regardless of depth mode. # Check out the "splat" in zink_compiler.c around !is_new_style_shadow, and the swizzle rewrite for depth # textures in zink_create_sampler_view(). diff --git a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt index 67d15a936ee..4007d900c11 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-navi10-fails.txt @@ -457,13 +457,6 @@ spec@ext_texture_srgb@fbo-generatemipmap-formats@GL_SLUMINANCE8_ALPHA8,Fail spec@ext_texture_srgb@fbo-generatemipmap-formats@GL_SLUMINANCE8_ALPHA8 NPOT,Fail spec@ext_texture_srgb@fbo-generatemipmap-formats@GL_SLUMINANCE_ALPHA,Fail spec@ext_texture_srgb@fbo-generatemipmap-formats@GL_SLUMINANCE_ALPHA NPOT,Fail -spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail -spec@!opengl 1.1@read-front,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail -spec@!opengl 1.1@read-front samples=2,Fail -spec@!opengl 1.1@read-front samples=4,Fail -spec@!opengl 1.1@read-front samples=6,Fail -spec@!opengl 1.1@read-front samples=8,Fail spec@ext_framebuffer_blit@fbo-blit-check-limits,Fail # ACO bugs (pass with LLVM) diff --git a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt index fd07064116e..2f21d78bf98 100644 --- a/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt +++ b/src/gallium/drivers/zink/ci/zink-radv-vangogh-fails.txt @@ -455,13 +455,6 @@ spec@ext_texture_srgb@fbo-generatemipmap-formats@GL_SLUMINANCE8_ALPHA8,Fail spec@ext_texture_srgb@fbo-generatemipmap-formats@GL_SLUMINANCE8_ALPHA8 NPOT,Fail spec@ext_texture_srgb@fbo-generatemipmap-formats@GL_SLUMINANCE_ALPHA,Fail spec@ext_texture_srgb@fbo-generatemipmap-formats@GL_SLUMINANCE_ALPHA NPOT,Fail -spec@!opengl 1.0@gl-1.0-swapbuffers-behavior,Fail -spec@!opengl 1.1@read-front,Fail -spec@!opengl 1.1@read-front clear-front-first,Fail -spec@!opengl 1.1@read-front samples=2,Fail -spec@!opengl 1.1@read-front samples=4,Fail -spec@!opengl 1.1@read-front samples=6,Fail -spec@!opengl 1.1@read-front samples=8,Fail spec@ext_framebuffer_blit@fbo-blit-check-limits,Fail # ACO bugs (pass with LLVM)