[Mesa-dev] [PATCH 13/15] travis: add Gallium state-tracker targets

Andres Gomez agomez at igalia.com
Fri Apr 28 14:45:10 UTC 2017


On Thu, 2017-04-27 at 19:38 +0100, Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> Split into OpenCL and others, since the former is quite time consuming.
> 
> v2:
>  - explicitly enable/disable components
>  - build libvdpau 1.1 requirement
>  - enable st/vdpau
>  - build libva 1.6.2 (API 0.38) requirement
> 
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
>  .travis.yml | 83 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 83 insertions(+)
> 
> diff --git a/.travis.yml b/.travis.yml
> index 57c4a431534..86f88e86b05 100644
> --- a/.travis.yml
> +++ b/.travis.yml
> @@ -20,6 +20,8 @@ env:
>      - LIBXCB_VERSION=libxcb-1.11
>      - LIBXSHMFENCE_VERSION=libxshmfence-1.2
>      - LIBTXC_DXTN_VERSION=libtxc_dxtn-1.0.1
> +    - LIBVDPAU_VERSION=libvdpau-1.1
> +    - LIBVA_VERSION=libva-1.6.2
>      - PKG_CONFIG_PATH=$HOME/prefix/lib/pkgconfig
>      - LD_LIBRARY_PATH="$HOME/prefix/lib:$LD_LIBRARY_PATH"
>  
> @@ -33,6 +35,7 @@ matrix:
>          # XXX: Add wayland platform
>          - DRI_LOADERS="--enable-glx --enable-gbm --enable-egl --with-platforms=x11,drm,surfaceless --enable-osmesa"
>          - DRI_DRIVERS="i915,i965,radeon,r200,swrast,nouveau"
> +        - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
>          - GALLIUM_DRIVERS=""
>          - VULKAN_DRIVERS=""
>        addons:
> @@ -55,6 +58,7 @@ matrix:
>          - OVERRIDE_CXX="g++-5"
>          - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
>          - DRI_DRIVERS=""
> +        - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
>          - GALLIUM_DRIVERS="swr"
>          - VULKAN_DRIVERS=""
>        addons:
> @@ -82,6 +86,7 @@ matrix:
>          - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
>          - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
>          - DRI_DRIVERS=""
> +        - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
>          - GALLIUM_DRIVERS="i915,nouveau,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,etnaviv,imx"
>          - VULKAN_DRIVERS=""
>        addons:
> @@ -89,6 +94,8 @@ matrix:
>            sources:
>              - llvm-toolchain-trusty-3.9
>            packages:
> +            # LLVM packaging is broken and misses these dependencies
> +            - libedit-dev
>              # From sources above
>              - llvm-3.9-dev
>              # Common
> @@ -97,6 +104,71 @@ matrix:
>              - libx11-xcb-dev
>              - libelf-dev
>      - env:
> +        # NOTE: Analogous to SWR above, building Clover is quite slow.
> +        - LABEL="make Gallium ST Clover"
> +        - BUILD=make
> +        - MAKEFLAGS=-j2
> +        - MAKE_CHECK_COMMAND="true"
> +        - LLVM_VERSION=3.6
> +        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
> +        - OVERRIDE_CC=gcc-4.7
> +        - OVERRIDE_CXX=g++-4.7
> +        - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl"
> +        - DRI_DRIVERS=""
> +        - GALLIUM_ST="--disable-dri --enable-opencl --enable-opencl-icd --enable-llvm --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa"
> +        # i915 most likely doesn't work with OpenCL.
> +        # Regardless - we're doing a quick build test here.
> +        - GALLIUM_DRIVERS="i915"
> +        - VULKAN_DRIVERS=""
> +      addons:
> +        apt:
> +          sources:
> +            - ubuntu-toolchain-r-test

g++-4.7 comes with Trusty:
http://packages.ubuntu.com/trusty/g++-4.7

Therefore, the line above is not needed.

With that change, this is:

Reviewed-by: Andres Gomez <agomez at igalia.com>

-- 
Br,

Andres


More information about the mesa-dev mailing list