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

[Emil Velikov]

From: Emil Velikov <emil.velikov at collabora.com>

Split into OpenCL and others, since the former is quite time consuming.

Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
---
 .travis.yml | 65 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 65 insertions(+)

diff --git a/.travis.yml b/.travis.yml
index 98c2c594328..041e3258b28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,6 +36,7 @@ matrix:
         # XXX: Add wayland platform
         - DRI_LOADERS="--enable-glx --enable-gbm --enable-egl --with-egl-platforms=x11,drm,surfaceless --enable-osmesa"
         - DRI_DRIVERS="i915,i965,radeon,r200,swrast,nouveau"
+        - GALLIUM_ST=""
         - GALLIUM_DRIVERS=""
         - VULKAN_DRIVERS=""
       addons:
@@ -57,6 +58,8 @@ matrix:
         - OVERRIDE_CXX=g++-5
         - DRI_LOADERS=""
         - DRI_DRIVERS=""
+        # Explicitly enable the mesa/DRI state-tracker for clarity.
+        - GALLIUM_ST="--enable-dri"
         - GALLIUM_DRIVERS="swr"
         - VULKAN_DRIVERS=""
       addons:
@@ -81,6 +84,8 @@ matrix:
         - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
         - DRI_LOADERS=""
         - DRI_DRIVERS=""
+        # Explicitly enable the mesa/DRI state-tracker for clarity.
+        - GALLIUM_ST="--enable-dri"
         - GALLIUM_DRIVERS="i915,nouveau,r300,r600,radeonsi,freedreno,svga,swrast,vc4,virgl,etnaviv,imx"
         - VULKAN_DRIVERS=""
       addons:
@@ -96,6 +101,65 @@ 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
+        - LLVM_VERSION=3.6
+        - LLVM_CONFIG="llvm-config-${LLVM_VERSION}"
+        - OVERRIDE_CC=gcc-4.7
+        - OVERRIDE_CXX=g++-4.7
+        - DRI_LOADERS=""
+        - DRI_DRIVERS=""
+        # OpenCL requires LLVM, with the latter being autodetected.
+        - GALLIUM_ST="--enable-opencl --enable-opencl-icd --enable-llvm"
+        # 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
+            - llvm-toolchain-trusty-3.6
+          packages:
+            - libclc-dev
+            # From sources above
+            - g++-4.7
+            - llvm-3.6-dev
+            - clang-3.6
+            # Common
+            - x11proto-xf86vidmode-dev
+            - libexpat1-dev
+            - libx11-xcb-dev
+            - libelf-dev
+    - env:
+        - LABEL="make Gallium ST Other"
+        - BUILD=make
+        - MAKEFLAGS=-j2
+        - DRI_LOADERS=""
+        - DRI_DRIVERS=""
+        # XXX: Disable VDPAU for now, since we require 1.1 while only 0.7 is available
+        - GALLIUM_ST="--enable-xa --enable-nine --enable-xvmc --disable-vdpau --enable-va --enable-omx --enable-gallium-osmesa"
+        # We need swrast for osmesa and nine.
+        # i915 most likely doesn't work with most ST.
+        # Regardless - we're doing a quick build test here.
+        - GALLIUM_DRIVERS="i915,swrast"
+        - VULKAN_DRIVERS=""
+      addons:
+        apt:
+          packages:
+            # Nine requires gcc 4.6... which is the one we have right ?
+            - libxvmc-dev
+            #- libvdpau-dev
+            - libva-dev
+            - libomxil-bellagio-dev
+            # Common
+            - x11proto-xf86vidmode-dev
+            - libexpat1-dev
+            - libx11-xcb-dev
+            - libelf-dev
+    - env:
         - LABEL="make Vulkan"
         - BUILD=make
         - MAKEFLAGS=-j2
@@ -256,6 +320,7 @@ script:
       ./autogen.sh --enable-debug
         $DRI_LOADERS
         --with-dri-drivers=$DRI_DRIVERS
+        $GALLIUM_ST
         --with-gallium-drivers=$GALLIUM_DRIVERS
         --with-vulkan-drivers=$VULKAN_DRIVERS
         --disable-llvm-shared-libs
-- 
2.11.1