Commit edb4f2f1 authored by Eric Engestrom's avatar Eric Engestrom 💤 Committed by Michel Dänzer
Browse files

gitlab-ci: merge meson-glvnd into meson-swr



There's no need to have a whole build just for that flag, we can add it
to any build.
Signed-off-by: Eric Engestrom's avatarEric Engestrom <eric.engestrom@intel.com>
parent 768c1c8c
Pipeline #31410 passed with stages
in 9 minutes and 22 seconds
......@@ -122,14 +122,13 @@ debian:
# NOTE: Building SWR is 2x (yes two) times slower than all the other
# gallium drivers combined.
# Start this early so that it doesn't limit the total run time.
meson-swr:
meson-swr-glvnd:
extends: .meson-build
variables:
UNWIND: "true"
DRI_LOADERS: >
-D glx=disabled
-D egl=false
-D gbm=false
-D glvnd=true
-D egl=true
GALLIUM_ST: >
-D dri3=true
-D gallium-vdpau=false
......@@ -203,25 +202,6 @@ meson-loader-classic-dri:
GALLIUM_DRIVERS: "iris,nouveau,kmsro,r300,r600,freedreno,svga,v3d,vc4,virgl,etnaviv,panfrost,lima"
LLVM_VERSION: "7"
meson-glvnd:
extends: .meson-build
variables:
UNWIND: "true"
DRI_LOADERS: >
-D glvnd=true
-D egl=true
-D gbm=true
-D glx=dri
DRI_DRIVERS: "i965"
GALLIUM_ST: >
-D gallium-vdpau=false
-D gallium-xvmc=false
-D gallium-omx=disabled
-D gallium-va=false
-D gallium-xa=false
-D gallium-nine=false
-D gallium-opencl=disabled
meson-clover-llvm:
extends: .meson-build
variables:
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment