Mesa (master): ci: enable venus in some meson build jobs

[GitLab Mirror]

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

Author: Chia-I Wu <olvaffe at gmail.com>
Date:   Thu Apr  8 21:01:58 2021 -0700

ci: enable venus in some meson build jobs

Enable it in meson-{android,clang,vulkan,i386}.

Signed-off-by: Chia-I Wu <olvaffe at gmail.com>
Reviewed-by: Tomeu Vizoso <tomeu.vizoso at collabora.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/10124>

---

 .gitlab-ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 46d2567695c..219a89f7dfd 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -770,7 +770,7 @@ meson-android:
     LLVM_VERSION: ""
     PKG_CONFIG_LIBDIR: "/disable/non/android/system/pc/files"
   script:
-    - PKG_CONFIG_PATH=/usr/local/lib/aarch64-linux-android/pkgconfig/:/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/pkgconfig/ CROSS=aarch64-linux-android GALLIUM_DRIVERS=etnaviv,freedreno,lima,panfrost,vc4,v3d VULKAN_DRIVERS=freedreno,broadcom .gitlab-ci/meson/build.sh
+    - PKG_CONFIG_PATH=/usr/local/lib/aarch64-linux-android/pkgconfig/:/android-ndk-r21d/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/aarch64-linux-android/pkgconfig/ CROSS=aarch64-linux-android GALLIUM_DRIVERS=etnaviv,freedreno,lima,panfrost,vc4,v3d VULKAN_DRIVERS=freedreno,broadcom,virtio-experimental .gitlab-ci/meson/build.sh
     # x86_64 build:
     # Can't do Intel because gen_decoder.c currently requires libexpat, which
     # is not a dependency that AOSP wants to accept.  Can't do Radeon because
@@ -873,7 +873,7 @@ meson-clang:
       -D glvnd=true
     DRI_DRIVERS: "auto"
     GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swr,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,radeonsi,tegra,d3d12"
-    VULKAN_DRIVERS: intel,amd,freedreno,broadcom
+    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio-experimental
     CC: "ccache clang-10"
     CXX: "ccache clang++-10"
 
@@ -961,7 +961,7 @@ meson-vulkan:
       -D c_args=-fno-sanitize-recover=all
       -D cpp_args=-fno-sanitize-recover=all
     UBSAN_OPTIONS: "print_stacktrace=1"
-    VULKAN_DRIVERS: intel,amd,freedreno,broadcom
+    VULKAN_DRIVERS: intel,amd,freedreno,broadcom,virtio-experimental
     EXTRA_OPTION: >
       -D vulkan-layers=device-select,overlay
       -D build-aco-tests=true
@@ -973,7 +973,7 @@ meson-i386:
     - .use-i386_build
   variables:
     CROSS: i386
-    VULKAN_DRIVERS: intel,amd,swrast
+    VULKAN_DRIVERS: intel,amd,swrast,virtio-experimental
     GALLIUM_DRIVERS: "iris,nouveau,r300,r600,radeonsi,swrast,virgl,zink"
     DRI_DRIVERS: "i915,i965,r100,r200,nouveau"
     EXTRA_OPTION: >