diff options
| author | Emil Velikov <[email protected]> | 2017-05-04 11:05:27 +0100 |
|---|---|---|
| committer | Emil Velikov <[email protected]> | 2017-05-19 19:46:55 +0100 |
| commit | 552cd5cce5ff75527d4755e1e2fb13ecf268575f (patch) | |
| tree | adfa53236888a37d1d5e1314ca990366d6a03bfa | |
| parent | 5ab6ded0a93829a668457fdb5bcfbe8b7fb99c7b (diff) | |
travis: remove workarounds for the Vulkan target
Previously we required --enable-egl for the platform selection to work.
Additionally due to the broken DRI3 dependency tracking we needed
--enable-glx.
Since both of these are now sorted now we no longer need the
workarounds.
While we're here, explicitly enable dri3.
Cc: <[email protected]>
Signed-off-by: Emil Velikov <[email protected]>
Reviewed-by: Eric Engestrom <[email protected]>
| -rw-r--r-- | .travis.yml | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/.travis.yml b/.travis.yml index 5e060d0335c..0ab186957d0 100644 --- a/.travis.yml +++ b/.travis.yml @@ -179,12 +179,9 @@ matrix: - MAKE_CHECK_COMMAND="make -C src/gtest check && make -C src/intel check" - LLVM_VERSION=3.9 - LLVM_CONFIG="llvm-config-${LLVM_VERSION}" - # XXX: we want to test the WSI, but those are enabled via the EGL toggles - # XXX: Platform X11 dependencies are checked when --enable-glx is set - - DRI_LOADERS="--enable-glx --disable-gbm --enable-egl --with-platforms=x11,wayland" + - DRI_LOADERS="--disable-glx --disable-gbm --disable-egl --with-platforms=x11,wayland" - DRI_DRIVERS="" - # XXX: enable DRI for EGL above - - GALLIUM_ST="--enable-dri --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa" + - GALLIUM_ST="--enable-dri --enable-dri3 --disable-opencl --disable-xa --disable-nine --disable-xvmc --disable-vdpau --disable-va --disable-omx --disable-gallium-osmesa" - GALLIUM_DRIVERS="" - VULKAN_DRIVERS="intel,radeon" addons: |