From e5c1d7567b6aeb8fc51e227d782db9da4cbda93b Mon Sep 17 00:00:00 2001 From: Emil Velikov Date: Fri, 10 May 2019 14:52:36 +0100 Subject: [PATCH] ci: fold duplicate backend handling in run_test_on_backends() Note this affectively adds GALLIVM_PERF to vtest-llvmpipe, just like the normal llvmpipe backend. Signed-off-by: Emil Velikov Signed-off-by: Elie Tournier --- ci/run_test_suite.sh | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/ci/run_test_suite.sh b/ci/run_test_suite.sh index 5af9ef8..7efeaa1 100755 --- a/ci/run_test_suite.sh +++ b/ci/run_test_suite.sh @@ -374,25 +374,13 @@ run_test_on_backends() fi case $BACKEND in - vtest-softpipe) + vtest-softpipe|softpipe) export LIBGL_ALWAYS_SOFTWARE=1 export GALLIUM_DRIVER=softpipe export DRIVER_NAME=$GALLIUM_DRIVER ;; - vtest-llvmpipe) - export LIBGL_ALWAYS_SOFTWARE=1 - export GALLIUM_DRIVER=llvmpipe - export DRIVER_NAME=$GALLIUM_DRIVER - ;; - - softpipe) - export LIBGL_ALWAYS_SOFTWARE=1 - export GALLIUM_DRIVER=softpipe - export DRIVER_NAME=$GALLIUM_DRIVER - ;; - - llvmpipe) + vtest-llvmpipe|llvmpipe) export GALLIVM_PERF=nopt,no_filter_hacks export LIBGL_ALWAYS_SOFTWARE=1 export GALLIUM_DRIVER=llvmpipe