libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-02-04 01:46:42 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

BUILD: Promote GLEW to configure option

Browse Source 
# Conflicts:
#	backends/graphics/surfacesdl/surfacesdl-graphics.cpp
This commit is contained in:
Dries Harnie 2015-05-06 10:36:29 +08:00
parent f0098e268f
commit 9e1b0f1516
3 changed files with 45 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
backends/graphics/surfacesdl/surfacesdl-graphics.cpp
View File

@ -364,16 +364,17 @@ Graphics::PixelBuffer SurfaceSdlGraphicsManager::setupScreen(uint screenW, uint
SDL_GL_GetAttribute(SDL_GL_STENCIL_SIZE, &glflag);
debug("INFO: OpenGL Stencil buffer bits: %d", glflag);
#ifdef USE_OPENGL_SHADERS
debug("INFO: GLSL version: %s", glGetString(GL_SHADING_LANGUAGE_VERSION));
// GLEW needs to be initialized to use shaders
#ifdef USE_GLEW
debug("INFO: GLEW Version: %s", glewGetString(GLEW_VERSION));
GLenum err = glewInit();
if (err != GLEW_OK) {
warning("Error: %s", glewGetErrorString(err));
g_system->quit();
}
#endif
#ifdef USE_OPENGL_SHADERS
debug("INFO: GLSL version: %s", glGetString(GL_SHADING_LANGUAGE_VERSION));
const GLfloat vertices[] = {
0.0, 0.0,

58
configure vendored
View File

@ -127,6 +127,7 @@ _png=auto
_theoradec=auto
_faad=no
_fluidsynth=no
_glew=auto
_opengl=auto
_opengles=no
_opengles2=no
@ -1034,6 +1035,8 @@ for ac_option in $@; do
--disable-updates) _updates=no ;;
--enable-libunity) _libunity=yes ;;
--disable-libunity) _libunity=no ;;
--enable-glew) _glew=yes ;; #ResidualVM specific option
--disable-glew) _glew=no ;; #ResidualVM specific option
--enable-opengl) _opengl=yes ;;
--disable-opengl) _opengl=no ;;
--enable-opengl-shaders) _opengl_shaders=yes ;; #ResidualVM specific option
@ -3957,6 +3960,39 @@ echo "$_freetype2"
define_in_config_if_yes "$_freetype2" "USE_FREETYPE2"
# ResidualVM specific start ->
#
# Check for GLEW
#
if test "$_glew" != "no"; then
if test "$_opengl" = "no"; then
echo "Cannot use GLEW without OpenGL."
_glew=no
else
_glew=no
GLEW_LIBS=`pkg-config --libs glew 2>> $TMPLOG`
GLEW_INCLUDES=`pkg-config --cflags glew 2>> $TMPLOG`
cat > $TMPC << EOF
#include <GL/glew.h>
int main(void) {
glewInit();
return 0;
}
EOF
if cc_check $DEFINES $GLEW_LIBS $GLEW_INCLUDES
then
_glew=yes
LIBS="$LIBS $GLEW_LIBS"
INCLUDES="$INCLUDES $GLEW_INCLUDES"
fi
fi
fi
echocheck "GL Extension Wrangler (GLEW)"
echo "$_glew"
define_in_config_if_yes "$_glew" "USE_GLEW"
# ResidualVM specific end <-
#
# Check for iconv
#
@ -4145,25 +4181,9 @@ EOF
if test "$_opengl" = yes ; then
LIBS="$LIBS $OPENGL_LIBS"
INCLUDES="$INCLUDES $OPENGL_CFLAGS"
if test "$_opengl_shaders" = yes ; then
if test "$_opengles2" = no ; then
_opengl_shaders=no
GLEW_LIBS=`pkg-config --libs glew 2>> $TMPLOG`
GLEW_INCLUDES=`pkg-config --cflags glew 2>> $TMPLOG`
cat > $TMPC << EOF
#include <GL/glew.h>
int main(void) {
glewInit();
return 0;
}
EOF
if cc_check_no_clean $DEFINES $GLEW_LIBS $GLEW_INCLUDES
then
_opengl_shaders=yes
LIBS="$LIBS $GLEW_LIBS"
INCLUDES="$INCLUDES $GLEW_INCLUDES"
fi
fi
if test "$_opengl_shaders" = yes && test "$_opengles2" = no && test "$_glew" = no; then
echo "WARNING: OpenGL Shader support requires GLEW!"
_opengl_shaders=no
fi
else
_opengl_shaders=no

2
graphics/opengles2/system_headers.h
View File

@ -41,7 +41,7 @@
# define GL_BGRA GL_BGRA_EXT
#endif
#elif defined(USE_OPENGL_SHADERS)
#elif defined(USE_GLEW)
#include <GL/glew.h>
#elif defined(SDL_BACKEND) && defined(USE_OPENGL)
#include <SDL_opengl.h>