Skip to content

Commit

Permalink
package/ci: enable SwiftShader tests on Travis.
Browse files Browse the repository at this point in the history
  • Loading branch information
mosra committed Mar 4, 2019
1 parent 798c485 commit deb8c45
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 2 deletions.
5 changes: 5 additions & 0 deletions doc/changelog-integration.dox
Expand Up @@ -46,6 +46,11 @@ namespace Magnum {
- If both a CMake-based ImGui installation is found and `IMGUI_DIR` is set
when building, `FindImGui.cmake` prefers the location given by `IMGUI_DIR`

@subsection changelog-integration-latest-buildsystem Build system

- ES 2.0 and ES 3.0 subset of tests requiring GL context is now run on Travis
CI using SwiftShader for better code coverage

@subsection changelog-integration-latest-bugfixes Bug fixes

- The @ref ImGuiIntegration::image() widget was flipping the texture
Expand Down
12 changes: 10 additions & 2 deletions package/ci/travis-desktop-gles.sh
Expand Up @@ -24,9 +24,12 @@ cmake .. \
-DCMAKE_INSTALL_PREFIX=$HOME/deps \
-DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
-DCMAKE_BUILD_TYPE=Debug \
-DEGL_LIBRARY=$HOME/swiftshader/libEGL.so \
-DOPENGLES2_LIBRARY=$HOME/swiftshader/libGLESv2.so \
-DOPENGLES3_LIBRARY=$HOME/swiftshader/libGLESv2.so \
-DCMAKE_INSTALL_RPATH=$HOME/swiftshader \
-DTARGET_GLES=ON \
-DTARGET_GLES2=$TARGET_GLES2 \
-DTARGET_DESKTOP_GLES=ON \
-DWITH_AUDIO=OFF \
-DWITH_DEBUGTOOLS=OFF \
-DWITH_MESHTOOLS=OFF \
Expand All @@ -52,6 +55,10 @@ cmake .. \
-DCMAKE_INSTALL_RPATH=$HOME/deps/lib \
-DIMGUI_DIR=$HOME/imgui \
-DCMAKE_BUILD_TYPE=Debug \
-DEGL_LIBRARY=$HOME/swiftshader/libEGL.so \
-DOPENGLES2_LIBRARY=$HOME/swiftshader/libGLESv2.so \
-DOPENGLES3_LIBRARY=$HOME/swiftshader/libGLESv2.so \
-DCMAKE_INSTALL_RPATH=$HOME/swiftshader \
-DWITH_BULLET=ON \
-DWITH_DART=OFF \
-DWITH_GLM=ON \
Expand All @@ -62,4 +69,5 @@ cmake .. \
-G Ninja
# Otherwise the job gets killed (probably because using too much memory)
ninja -j4
CORRADE_TEST_COLOR=ON ctest -V -E GLTest
CORRADE_TEST_COLOR=ON ctest -V
if [ "$TARGET_GLES2" == "ON" ]; then CORRADE_TEST_COLOR=ON MAGNUM_DISABLE_EXTENSIONS="OES_vertex_array_object" ctest -V -R GLTest; fi
4 changes: 4 additions & 0 deletions package/ci/travis.yml
Expand Up @@ -195,6 +195,10 @@ install:
# ImGui
- if [ ! -e "$HOME/imgui/imgui.h" ]; then cd $HOME ; wget -nc --no-check-certificate -O imgui.tar.gz https://github.com/ocornut/imgui/archive/v1.67.tar.gz && mkdir -p imgui && cd imgui && tar --strip-components=1 -xzf ../imgui.tar.gz && cd $TRAVIS_BUILD_DIR; fi

# SwiftShader on Linux (cached). Taken from Chromium snapshot 587878
# (swiftshader-bin Arch package).
- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop-gles" ] && [ ! -e "$HOME/swiftshader/libEGL.so" ]; then cd $HOME ; wget https://ci.magnum.graphics/swiftshader-chromium-587878.tar.gz && mkdir -p swiftshader && cd swiftshader && tar -xzf ../swiftshader-chromium-587878.tar.gz && cd $TRAVIS_BUILD_DIR ; fi

script:
- if [ "$TRAVIS_OS_NAME" == "linux" ] && ( [ "$TARGET" == "desktop" ] || [ "$TARGET" == "desktop-sanitizers" ] ); then ./package/ci/travis-desktop.sh; fi
- if [ "$TRAVIS_OS_NAME" == "linux" ] && [ "$TARGET" == "desktop-gles" ]; then ./package/ci/travis-desktop-gles.sh; fi
Expand Down

0 comments on commit deb8c45

Please sign in to comment.