1
0
mirror of https://github.com/libretro/RetroArch synced 2024-07-05 09:48:42 +00:00

Merge pull request #9150 from orbea/glsl

qb: Improve the glsl check.
This commit is contained in:
Twinaphex 2019-07-21 11:49:09 +02:00 committed by GitHub
commit af2b2b07f2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 8 deletions

View File

@ -365,14 +365,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

View File

@ -152,6 +152,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)