diff options
| author | Eric Engestrom <eric.engestrom@intel.com> | 2019-04-16 18:06:53 +0200 |
|---|---|---|
| committer | Eric Anholt <eric@anholt.net> | 2019-05-02 20:39:12 +0000 |
| commit | 1291c68c9c44f7406404db83528001378079f4dd (patch) | |
| tree | 54eb2fafb595a452acbe925671331246d89a16f8 /.gitlab-ci.yml | |
| parent | 043b54a35da8e2a0de1582daaef32aaafee03e72 (diff) | |
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.
v2: Add a note about why we put glvnd where we did (by anholt).
Signed-off-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Eric Anholt <eric@anholt.net>
Reviewed-by: Michel Dänzer <michel.daenzer@amd.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com> (v2)
Acked-by: Dylan Baker <dylan@pnwbakers.com>
Diffstat (limited to '.gitlab-ci.yml')
| -rw-r--r-- | .gitlab-ci.yml | 29 |
1 files changed, 6 insertions, 23 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bdce87eb54e..734d1f9e936 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -126,14 +126,16 @@ debian: # We also put softpipe (and therefore gallium nine, which requires # it) here, since softpipe/llvmpipe can't be built alongside classic # swrast. -meson-swr: +# +# Putting glvnd here is arbitrary, but we want it in one of the builds +# for coverage. +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 @@ -208,25 +210,6 @@ meson-main: 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: |