From 19774f820ffd5288378fd6a9468835bc2ab5838a Mon Sep 17 00:00:00 2001 From: orbea Date: Sun, 21 Jul 2019 00:36:13 -0700 Subject: [PATCH] qb: Improve the glsl check. --- qb/config.libs.sh | 10 ++-------- qb/config.params.sh | 1 + 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/qb/config.libs.sh b/qb/config.libs.sh index 57cf628b72..4bf972a297 100644 --- a/qb/config.libs.sh +++ b/qb/config.libs.sh @@ -378,14 +378,8 @@ elif [ "$HAVE_OPENGLES" != 'no' ] && [ "$HAVE_OPENGLES3" != 'yes' ]; then HAVE_OPENGL_CORE='no' fi -if [ "$HAVE_OPENGL" != 'no' ] || [ "$HAVE_OPENGLES" != 'no' ] || [ "$HAVE_OPENGLES3" != 'no' ]; then - HAVE_GLSL='yes' -else -if [ "$HAVE_GLSL" != "no" ]; then - die : 'Notice: glsl disabled.' - HAVE_GLSL='no' -fi -fi +check_enabled 'OPENGL OPENGLES OPENGLES3' GLSL GLSL \ + 'OpenGL and OpenGLES are' false check_enabled ZLIB BUILTINZLIB 'builtin zlib' 'zlib is' true diff --git a/qb/config.params.sh b/qb/config.params.sh index 863f59cdef..fcfb11d985 100644 --- a/qb/config.params.sh +++ b/qb/config.params.sh @@ -151,6 +151,7 @@ HAVE_VIDEOCORE=auto # Broadcom Videocore 4 support HAVE_DRMINGW=no # DrMingw exception handler HAVE_EASTEREGG=yes # Easter egg HAVE_CDROM=auto # CD-ROM support +HAVE_GLSL=yes # GLSL shaders support HAVE_SLANG=yes # slang support C89_SLANG=no HAVE_GLSLANG=yes # glslang support (requires C++11)