diff options
| -rw-r--r-- | .gitlab-ci.yml | 21 | ||||
| -rw-r--r-- | .gitlab-ci/Dockerfile.ubuntu | 2 | ||||
| -rw-r--r-- | .travis.yml | 32 |
3 files changed, 23 insertions, 32 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 237ce185dca..fafc9e075e7 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -259,6 +259,27 @@ build:meson-gallium-clover-llvm7: GALLIUM_DRIVERS: "r600,radeonsi" LLVM_VERSION: "7" +build:meson-gallium-st-other: + extends: .meson-build + variables: + UNWIND: "true" + DRI_LOADERS: > + -D glx=disabled + -D egl=false + -D gbm=false + GALLIUM_ST: > + -D dri3=true + -D gallium-vdpau=true + -D gallium-xvmc=true + -D gallium-omx=bellagio + -D gallium-va=true + -D gallium-xa=true + -D gallium-nine=true + -D gallium-opencl=disabled + -D osmesa=gallium + GALLIUM_DRIVERS: "nouveau,swrast" + LLVM_VERSION: "5.0" + build:make-vulkan: extends: .make-build variables: diff --git a/.gitlab-ci/Dockerfile.ubuntu b/.gitlab-ci/Dockerfile.ubuntu index 91cab6b791b..72f1efe0274 100644 --- a/.gitlab-ci/Dockerfile.ubuntu +++ b/.gitlab-ci/Dockerfile.ubuntu @@ -35,6 +35,8 @@ RUN apt-get install -y \ clang-7 \ libclang-7-dev \ libclc-dev \ + libxvmc-dev \ + libomxil-bellagio-dev \ xz-utils \ libexpat1-dev \ libx11-xcb-dev \ diff --git a/.travis.yml b/.travis.yml index 57f5be2ecc4..041ebea1e05 100644 --- a/.travis.yml +++ b/.travis.yml @@ -55,38 +55,6 @@ matrix: - python3-pip - python3-setuptools - env: - - LABEL="meson Gallium ST Other" - - BUILD=meson - - UNWIND="true" - - DRI_LOADERS="-Dglx=disabled -Degl=false -Dgbm=false" - - GALLIUM_ST="-Ddri3=true -Dgallium-vdpau=true -Dgallium-xvmc=true -Dgallium-omx=bellagio -Dgallium-va=true -Dgallium-xa=true -Dgallium-nine=true -Dgallium-opencl=disabled -Dosmesa=gallium" - # We need swrast for osmesa and nine. - # Nouveau supports, or builds at least against all ST. - - GALLIUM_DRIVERS="nouveau,swrast" - - LLVM_VERSION=5.0 - - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - addons: - apt: - packages: - - llvm-5.0-dev - # LLVM packaging is broken and misses these dependencies - - libedit-dev - # Nine requires gcc 4.6... which is the one we have right ? - - libxvmc-dev - # Build locally, for now. - #- libvdpau-dev - #- libva-dev - - libomxil-bellagio-dev - # Common - - xz-utils - - libexpat1-dev - - libx11-xcb-dev - - libelf-dev - - libunwind8-dev - - python3.5 - - python3-pip - - python3-setuptools - - env: # 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. |