From 0d167afc4fbc6603ef2ac1c4745a6b3aabdd15aa Mon Sep 17 00:00:00 2001 From: orbea Date: Sat, 1 Jun 2019 07:52:16 -0700 Subject: [PATCH] Fix the OpenGLES3 build. This depends on HAVE_EGL. Revert "Remove this Travis test for now" This reverts commit 678089c2dec04e3cdf1aefade73a13fa07bb1d9f. --- .travis.yml | 2 ++ qb/config.libs.sh | 1 + 2 files changed, 3 insertions(+) diff --git a/.travis.yml b/.travis.yml index 95192f6c2b..631cd3edea 100644 --- a/.travis.yml +++ b/.travis.yml @@ -31,6 +31,8 @@ matrix: 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 diff --git a/qb/config.libs.sh b/qb/config.libs.sh index ff71f1604d..8cd062d392 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -348,6 +348,7 @@ else HAVE_OPENGL='no' fi +check_enabled EGL OPENGLES3 OpenGLES3 'EGL is' false check_enabled OPENGL CG Cg 'OpenGL is' false check_enabled OPENGL OSMESA osmesa 'OpenGL is' false check_enabled OPENGL OPENGL1 OpenGL1 'OpenGL is' false