Mesa (master): zink/ci: handle getting correct drisw driver.

[GitLab Mirror]

Module: Mesa
Branch: master
Commit: 5890c322e14adf68af90249df58026abe5ddcb2e
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=5890c322e14adf68af90249df58026abe5ddcb2e

Author: Dave Airlie <airlied at redhat.com>
Date:   Tue Apr  6 03:55:49 2021 +1000

zink/ci: handle getting correct drisw driver.

With zink not being autopicked, fixup the CI to pick the
correct drivers for zink testing, noting that xvfb really
doesn't want zink to be chosen.

Reviewed-by: Eric Anholt <eric at anholt.net>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/9816>

---

 src/gallium/drivers/zink/ci/gitlab-ci.yml | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/zink/ci/gitlab-ci.yml b/src/gallium/drivers/zink/ci/gitlab-ci.yml
index ec39d268feb..420ee95daf3 100644
--- a/src/gallium/drivers/zink/ci/gitlab-ci.yml
+++ b/src/gallium/drivers/zink/ci/gitlab-ci.yml
@@ -2,8 +2,8 @@
   extends:
     - .zink-rules
   variables:
-    MESA_LOADER_DRIVER_OVERRIDE: "zink"
     ZINK_USE_LAVAPIPE: "true"
+    LIBGL_ALWAYS_SOFTWARE: "1"
     GPU_VERSION: zink-lvp
     # Fix non-conformant llvmpipe filter defaults
     GALLIVM_PERF: "no_filter_hacks"
@@ -15,17 +15,19 @@
     - .deqp-test
     - .zink-lvp-test
   variables:
+    GALLIUM_DRIVER: "zink" # move here due to bad xvfb-run interactions
     VK_DRIVER: lvp # Don't move to the top level, piglit runs do funny stuff with VK_DRIVER set
     DEQP_EXPECTED_RENDERER: "zink.*llvmpipe"
 
 zink-piglit-quick_gl:
   extends:
-    - .zink-lvp-deqp-test
+    - .test-gl
+    - .zink-lvp-test
   variables:
     PIGLIT_PROFILES: quick_gl
     PIGLIT_NO_WINDOW: 1
   script:
-    - xvfb-run --server-args='-noreset' sh -c install/piglit/piglit-runner.sh
+    - xvfb-run --server-args='-noreset' sh -c "GALLIUM_DRIVER=zink VK_DRIVER=lvp install/piglit/piglit-runner.sh"
 
 zink-lvp-gles2:
   extends: