diff options
| -rw-r--r-- | .gitlab-ci.yml | 20 | ||||
| -rw-r--r-- | .travis.yml | 26 |
2 files changed, 20 insertions, 26 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 6a27ca9f842..600d746ad4c 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -188,6 +188,26 @@ build:meson-gallium-swr: GALLIUM_DRIVERS: "swr" LLVM_VERSION: "6.0" +build:meson-gallium-radeonsi: + extends: .meson-build + variables: + UNWIND: "true" + DRI_LOADERS: > + -D glx=disabled + -D egl=false + -D gbm=false + GALLIUM_ST: > + -D dri3=false + -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 + GALLIUM_DRIVERS: "radeonsi" + LLVM_VERSION: "7" + build:make-vulkan: extends: .make-build variables: diff --git a/.travis.yml b/.travis.yml index 30bc0db9869..e129c41fc39 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,32 +55,6 @@ matrix: - python3-pip - python3-setuptools - env: - - LABEL="meson Gallium Drivers RadeonSI" - - BUILD=meson - - UNWIND="true" - - DRI_LOADERS="-Dglx=disabled -Degl=false -Dgbm=false" - - GALLIUM_ST="-Ddri3=false -Dgallium-vdpau=false -Dgallium-xvmc=false -Dgallium-omx=disabled -Dgallium-va=false -Dgallium-xa=false -Dgallium-nine=false -Dgallium-opencl=disabled" - - GALLIUM_DRIVERS="radeonsi" - - LLVM_VERSION=7 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - addons: - apt: - sources: - - sourceline: 'deb http://apt.llvm.org/xenial/ llvm-toolchain-xenial-7 main' - key_url: https://apt.llvm.org/llvm-snapshot.gpg.key - packages: - # From sources above - - llvm-7-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - libunwind8-dev - - python3.5 - - python3-pip - - python3-setuptools - - env: - LABEL="meson Gallium Drivers Other" - BUILD=meson - UNWIND="true" |