turnip: Deconflict vk_format_table regeneration

[mesa.git] / .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 19f531975983442f4ce9147b433c27748c79ea4b..014e06b29dcb8978fa1a561621b9e4012a458100 100644 (file)
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -267,7 +267,7 @@ meson-gallium-drivers-other:
       -D gallium-xa=false
       -D gallium-nine=false
       -D gallium-opencl=disabled
-    GALLIUM_DRIVERS: "i915,iris,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv"
+    GALLIUM_DRIVERS: "i915,iris,nouveau,kmsro,r300,r600,freedreno,svga,swrast,v3d,vc4,virgl,etnaviv,panfrost"
     LLVM_VERSION: "5.0"
 
 meson-gallium-clover-llvm:
@@ -423,6 +423,7 @@ make-gallium-st-clover-llvm:
       --disable-gallium-osmesa
     LIBUNWIND_FLAGS: --enable-libunwind
     GALLIUM_DRIVERS: "r600,radeonsi"
+    LLVM_VERSION: "7"
 
 make-gallium-st-clover-llvm-39:
   extends: make-gallium-st-clover-llvm