From 3f3c489e51e1b8a82adee9c7c5942dadf218b70d Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 26 Mar 2019 11:06:00 -0700 Subject: [PATCH] test: Trim the Render ops that we test the composite paths on. We cover all Render ops under the "blend" group, so when we're doing the cross products of some formats for the masking operation, skip most of the ops (covering just zero, one, and src/dst alpha blend factors along with a definitely non-glamor-accelerated one) . All the tests now complete in <20s of runtime on my skylake. Signed-off-by: Eric Anholt --- test/meson.build | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/test/meson.build b/test/meson.build index 81f10955b..690298b77 100644 --- a/test/meson.build +++ b/test/meson.build @@ -8,6 +8,7 @@ piglit_env = environment() piglit_env.set('XSERVER_DIR', meson.source_root()) piglit_env.set('XSERVER_BUILDDIR', meson.build_root()) +some_ops = '-o clear,src,dst,over,xor,disjointover' rendercheck_tests = [ ['blend/All/a8r8g8b8', '-t blend -f a8r8g8b8'], ['blend/All/x8r8g8b8', '-t blend -f a8r8g8b8,x8r8g8b8'], @@ -15,13 +16,13 @@ rendercheck_tests = [ ['blend/Clear', '-t blend -o clear'], ['blend/Src', '-t blend -o src'], ['blend/Over', '-t blend -o over'], - ['composite/All/a8r8g8b8', '-t composite -f a8r8g8b8'], - ['composite/All/x8r8g8b8', '-t composite -f a8r8g8b8,x8r8g8b8'], - ['composite/All/a2r10g10b10', '-t composite -f a8r8g8b8,a2r10g10b10'], - ['ca composite/All/a8r8g8b8', '-t cacomposite -f a8r8g8b8'], - ['ca composite/All/a8', '-t cacomposite -f a8r8g8b8,a8'], - ['ca composite/All/x8r8g8b8', '-t cacomposite -f a8r8g8b8,x8r8g8b8'], - ['ca composite/All/a2r10g10b10', '-t cacomposite -f a8r8g8b8,a2r10g10b10'], + ['composite/Some/a8r8g8b8', '-t composite -f a8r8g8b8 ' + some_ops], + ['composite/Some/x8r8g8b8', '-t composite -f a8r8g8b8,x8r8g8b8' + some_ops], + ['composite/Some/a2r10g10b10', '-t composite -f a8r8g8b8,a2r10g10b10' + some_ops], + ['ca composite/Some/a8r8g8b8', '-t cacomposite -f a8r8g8b8' + some_ops], + ['ca composite/Some/a8', '-t cacomposite -f a8r8g8b8,a8' + some_ops], + ['ca composite/Some/x8r8g8b8', '-t cacomposite -f a8r8g8b8,x8r8g8b8' + some_ops], + ['ca composite/Some/a2r10g10b10', '-t cacomposite -f a8r8g8b8,a2r10g10b10' + some_ops], ['fill', '-t fill'], ['bug7366', '-t bug7366'], ['destination coordinates', '-t dcoords'],