summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitlab-ci.yml19
-rw-r--r--.gitlab-ci/Dockerfile.ubuntu1
2 files changed, 20 insertions, 0 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 03b77c78e86..b651de02225 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -165,6 +165,25 @@ build:meson-loader-classic-dri:
-D gallium-nine=false
-D gallium-opencl=disabled
+build: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
+
# NOTE: Building SWR is 2x (yes two) times slower than all the other
# gallium drivers combined.
# Start this early so that it doesn't hunder the run time.
diff --git a/.gitlab-ci/Dockerfile.ubuntu b/.gitlab-ci/Dockerfile.ubuntu
index ef7fba78773..dff5dccba37 100644
--- a/.gitlab-ci/Dockerfile.ubuntu
+++ b/.gitlab-ci/Dockerfile.ubuntu
@@ -45,6 +45,7 @@ RUN apt-get install -y \
x11proto-xf86vidmode-dev \
libelf-dev \
libunwind8-dev \
+ libglvnd-dev \
python2.7 \
python-pip \
python-setuptools \