From ecac89b732f5871b87c51ae601dd60a1eafd5886 Mon Sep 17 00:00:00 2001 From: Jesse Natalie Date: Mon, 28 Dec 2020 11:04:31 -0800 Subject: [PATCH] CI: Enable d3d12 driver for Linux CI builds Acked-by: Daniel Stone Reviewed-by: Eric Anholt Part-of: --- .gitlab-ci.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 11f18079971..56f6aa6d840 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -649,7 +649,7 @@ meson-gallium: -D gallium-xa=enabled -D gallium-nine=true -D gallium-opencl=disabled - GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swr,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink" + GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,swr,swrast,svga,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12" VULKAN_DRIVERS: swrast EXTRA_OPTION: > -D osmesa=true @@ -681,7 +681,7 @@ meson-release: -D gallium-nine=false -D gallium-opencl=disabled -D llvm=false - GALLIUM_DRIVERS: "nouveau,kmsro,freedreno,r300,svga,swrast,v3d,vc4,virgl,etnaviv,panfrost,lima,zink" + GALLIUM_DRIVERS: "nouveau,kmsro,freedreno,r300,svga,swrast,v3d,vc4,virgl,etnaviv,panfrost,lima,zink,d3d12" BUILDTYPE: "release" EXTRA_OPTION: > -D osmesa=true @@ -807,7 +807,7 @@ meson-clang: DRI_LOADERS: > -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" + 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 CC: "ccache clang-10" CXX: "ccache clang++-10"