diff --git a/.travis.yml b/.travis.yml index f282708b2a..8fd1622095 100644 --- a/.travis.yml +++ b/.travis.yml @@ -29,6 +29,10 @@ matrix: env: CXX_BUILD=1 CC=gcc-8 CXX=g++-8 - compiler: gcc env: DISABLE_MENU=1 CC=gcc-8 CXX=g++-8 + - compiler: gcc + env: ENABLE_GLES=1 CC=gcc-8 CXX=g++-8 + - compiler: gcc + env: ENABLE_GLES=1 ENABLE_GLES3=1 CC=gcc-8 CXX=g++-8 - compiler: clang env: CC=clang-6.0 CXX=clang++-6.0 - compiler: clang @@ -77,6 +81,14 @@ script: if [ -n "$DISABLE_MENU" ]; then ARGS="$ARGS --disable-menu" fi + - | + if [ -n "$ENABLE_GLES" ]; then + ARGS="$ARGS --enable-opengles" + fi + - | + if [ -n "$ENABLE_GLES3" ]; then + ARGS="$ARGS --enable-opengles3" + fi - ./configure $ARGS - | if [ -n "$C89_BUILD" ]; then diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 17eb7ccf20..510386e44c 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -351,6 +351,14 @@ fi if [ "$HAVE_OPENGL" = 'no' ] && [ "$HAVE_OPENGLES3" = 'no' ]; then die : 'Notice: OpenGL and OpenGLES3 are disabled. Disabling HAVE_OPENGL_CORE.' HAVE_OPENGL_CORE='no' +elif [ "$HAVE_OPENGLES" != 'no' ] && [ "$HAVE_OPENGLES3" != 'yes' ]; then + die : 'Notice: OpenGLES2 is enabled. Disabling the OpenGL core driver.' + HAVE_OPENGL_CORE='no' +fi + +if [ "$HAVE_OPENGLES" != 'no' ] || [ "$HAVE_OPENGLES3" != 'no' ]; then + die : 'Notice: OpenGLES is enabled. Disabling the OpenGL1 driver.' + HAVE_OPENGL1='no' fi if [ "$HAVE_ZLIB" = 'no' ]; then