thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CONFIGURE: More work on opengl flags

Browse source
This commit is contained in:
Paweł Kołodziejski 2020-10-14 18:37:17 +02:00
parent 1ea8c9ef03
commit a37173807f
32 changed files with 116 additions and 122 deletions
Download patch file Download diff file Expand all files Collapse all files

2
backends/platform/sdl/sdl.cpp
View file

@ -216,7 +216,7 @@ void OSystem_SDL::initBackend() {
#endif #endif
debug(1, "Using SDL Video Driver \"%s\"", sdlDriverName); debug(1, "Using SDL Video Driver \"%s\"", sdlDriverName);
#ifdef USE_OPENGL_GAME #if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
detectFramebufferSupport(); detectFramebufferSupport();
detectAntiAliasingSupport(); detectAntiAliasingSupport();
#endif #endif

6
backends/platform/sdl/sdl.h
View file

@ -36,7 +36,7 @@
#ifdef USE_DISCORD #ifdef USE_DISCORD
class DiscordPresence; class DiscordPresence;
#endif #endif
#ifdef USE_OPENGL_GAME #if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "backends/graphics3d/openglsdl/openglsdl-graphics3d.h" #include "backends/graphics3d/openglsdl/openglsdl-graphics3d.h"
#endif #endif
@ -90,7 +90,7 @@ public:
//Screenshots //Screenshots
virtual Common::String getScreenshotsPath(); virtual Common::String getScreenshotsPath();
#ifdef USE_OPENGL_GAME #if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
Common::Array<uint> getSupportedAntiAliasingLevels() const override; Common::Array<uint> getSupportedAntiAliasingLevels() const override;
#endif #endif
@ -128,7 +128,7 @@ protected:
SdlGraphicsManager::State _gfxManagerState; SdlGraphicsManager::State _gfxManagerState;
#ifdef USE_OPENGL_GAME #if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
// Graphics capabilities // Graphics capabilities
void detectFramebufferSupport(); void detectFramebufferSupport();
void detectAntiAliasingSupport(); void detectAntiAliasingSupport();

168
configure vendored
View file

@ -161,8 +161,9 @@ _fluidsynth=auto
_glew=auto _glew=auto
_opengl_mode=auto _opengl_mode=auto
_opengl_game=auto _opengl_game=auto
_opengles2=no _opengl_game_classic=no
_opengl_shaders=auto _opengl_game_shaders=auto
_opengl_game_es2=no
_readline=auto _readline=auto
_freetype2=auto _freetype2=auto
_taskbar=auto _taskbar=auto
@ -266,7 +267,7 @@ add_feature highres "high resolution" "_highres"
add_feature mad "MAD" "_mad" add_feature mad "MAD" "_mad"
add_feature jpeg "JPEG" "_jpeg" add_feature jpeg "JPEG" "_jpeg"
add_feature mpeg2 "mpeg2" "_mpeg2" add_feature mpeg2 "mpeg2" "_mpeg2"
add_feature opengl_shaders "OpenGL with shaders" "_opengl_shaders" add_feature opengl_game_shaders "OpenGL with shaders" "_opengl_game_shaders"
add_feature png "PNG" "_png" add_feature png "PNG" "_png"
add_feature theoradec "libtheoradec" "_theoradec" add_feature theoradec "libtheoradec" "_theoradec"
add_feature vorbis "Vorbis file support" "_vorbis _tremor" add_feature vorbis "Vorbis file support" "_vorbis _tremor"
@ -1110,10 +1111,10 @@ Optional Libraries:
--with-a52-prefix=DIR Prefix where liba52 is installed (optional) --with-a52-prefix=DIR Prefix where liba52 is installed (optional)
--enable-a52 enable a52 codec for MPEG decoder [autodetect] --enable-a52 enable a52 codec for MPEG decoder [autodetect]
--with-opengl-prefix=DIR prefix where OpenGL (ES) is installed (optional) --with-opengl-prefix=DIR prefix where OpenGL (ES) is installed (optional)
--disable-opengl-game disable OpenGL (ES) support in game [autodetect] --disable-opengl-game disable OpenGL (ES) support in game [autodetect]
--disable-opengl-shaders disable use of modern OpenGL with shaders --disable-opengl-game-shaders disable use of modern OpenGL with shaders
--force-opengles2 only detect OpenGL ES2 --force-opengl-game-es2 only detect OpenGL ES2
--with-glew-prefix=DIR prefix where GLEW is installed (optional) --with-glew-prefix=DIR prefix where GLEW is installed (optional)
--disable-glew disable GLEW support [autodetect] --disable-glew disable GLEW support [autodetect]
@ -1317,11 +1318,9 @@ for ac_option in $@; do
--disable-gtk) _gtk=no ;; --disable-gtk) _gtk=no ;;
--enable-glew) _glew=yes ;; --enable-glew) _glew=yes ;;
--disable-glew) _glew=no ;; --disable-glew) _glew=no ;;
--enable-opengl-game) _opengl_game=yes ;;
--disable-opengl-game) _opengl_game=no ;; --disable-opengl-game) _opengl_game=no ;;
--enable-opengl-shaders) _opengl_shaders=yes ;; --disable-opengl-game-shaders) _opengl_game_shaders=no ;;
--disable-opengl-shaders) _opengl_shaders=no ;; --force-opengl-game-es2) _opengl_game_es2=yes ;;
--force-opengles2) _opengles2=yes ;;
--enable-bink) _bink=yes ;; --enable-bink) _bink=yes ;;
--disable-bink) _bink=no ;; --disable-bink) _bink=no ;;
--enable-discord) _discord=yes ;; --enable-discord) _discord=yes ;;
@ -5234,51 +5233,6 @@ echo "$_freetype2"
define_in_config_if_yes "$_freetype2" "USE_FREETYPE2" define_in_config_if_yes "$_freetype2" "USE_FREETYPE2"
#
# Check for GLEW
#
echocheck "GL Extension Wrangler (GLEW)"
if test "$_glew" != "no" && test "$_opengl_mode" = "no"; then
_glew=no
echo "cannot use GLEW without OpenGL"
elif test "$_glew" != "no" && test "$_opengles2" = "yes"; then
_glew=no
echo "not needed with OpenGL ES v2"
else
case $_host_os in
mingw*)
_GLEW_CFLAGS="-DGLEW_STATIC"
_GLEW_LIBS="-lglew32 -lopengl32"
;;
*)
_GLEW_LIBS="-lGLEW"
;;
esac
if test "$_glew" = auto; then
_glew=no
cat > $TMPC << EOF
#include <GL/glew.h>
int main(void) {
glewInit();
return 0;
}
EOF
cc_check $DEFINES $GLEW_CFLAGS $_GLEW_CFLAGS $GLEW_LIBS $_GLEW_LIBS && _glew=yes
fi
if test "$_glew" = yes ; then
append_var LIBS "$GLEW_LIBS $_GLEW_LIBS"
append_var INCLUDES "$GLEW_CFLAGS $_GLEW_CFLAGS"
append_var LIBS_3D "$GLEW_LIBS $_GLEW_LIBS"
fi
echo "$_glew"
fi
define_in_config_if_yes "$_glew" "USE_GLEW"
# #
# Check for OpenGL (ES) # Check for OpenGL (ES)
# #
@ -5371,22 +5325,68 @@ case $_opengl_mode in
;; ;;
esac esac
#
# Check for GLEW
#
echocheck "GL Extension Wrangler (GLEW)"
if test "$_glew" != "no" && test "$_opengl" = "no"; then
_glew=no
echo "cannot use GLEW without OpenGL"
elif test "$_glew" != "no" && test "$_opengl_game_es2" = "yes"; then
_glew=no
echo "not needed with OpenGL ES v2"
else
case $_host_os in
mingw*)
_GLEW_CFLAGS="-DGLEW_STATIC"
_GLEW_LIBS="-lglew32 -lopengl32"
;;
*)
_GLEW_LIBS="-lGLEW"
;;
esac
if test "$_glew" = auto; then
_glew=no
cat > $TMPC << EOF
#include <GL/glew.h>
int main(void) {
glewInit();
return 0;
}
EOF
cc_check $DEFINES $GLEW_CFLAGS $_GLEW_CFLAGS $GLEW_LIBS $_GLEW_LIBS && _glew=yes
fi
if test "$_glew" = yes ; then
append_var LIBS "$GLEW_LIBS $_GLEW_LIBS"
append_var INCLUDES "$GLEW_CFLAGS $_GLEW_CFLAGS"
append_var LIBS_3D "$GLEW_LIBS $_GLEW_LIBS"
fi
echo "$_glew"
fi
define_in_config_if_yes "$_glew" "USE_GLEW"
# #
# Check for OpenGL (ES) for game # Check for OpenGL (ES) for game
# #
echocheck "OpenGL for game" echocheck "OpenGL for game"
if test "$_opengl_game" = auto ; then if test "$_opengl_game" = auto && test "$_opengl" = yes ; then
_opengl_game=no _opengl_game=no
if test "$_backend" = "sdl" || test "$_backend" = "android"; then if test "$_backend" = "sdl" || test "$_backend" = "android"; then
# Try different header filenames # Try different header filenames
# 1) GL/gl.h This is usually used on POSIX and Windows systems # 1) GL/gl.h This is usually used on POSIX and Windows systems
# 2) OpenGL/gl.h This is used on Mac OS X # 2) OpenGL/gl.h This is used on Mac OS X
# 3) GLES2/gl2.h This is used for OpenGL ES 2.x # 3) GLES2/gl2.h This is used for OpenGL ES 2.x
# 4) GLES/gl.h This is used for OpenGL ES 1.x for i in "GL/gl.h" "OpenGL/gl.h" "GLES2/gl2.h"; do
for i in "GL/gl.h" "OpenGL/gl.h" "GLES2/gl2.h" "GLES/gl.h"; do
# Test the current header for OpenGL # Test the current header for OpenGL
if test "$_opengles2" = no ; then if test "$_opengl_game_es2" = no ; then
cat > $TMPC << EOF cat > $TMPC << EOF
#include <$i> #include <$i>
#include <stdio.h> #include <stdio.h>
@ -5400,28 +5400,28 @@ EOF
#include <$i> #include <$i>
int main(void) { return GL_ES_VERSION_2_0; } int main(void) { return GL_ES_VERSION_2_0; }
EOF EOF
cc_check $DEFINES $OPENGL_CFLAGS $OPENGL_LIBS && _opengl_game=yes && _opengles2=yes && break cc_check $DEFINES $OPENGL_CFLAGS $OPENGL_LIBS && _opengl_game=yes && _opengl_game_es2=yes && break
done done
fi fi
fi fi
if test "$_opengl_game" = yes ; then if test "$_opengl_game" = yes && test "$_opengl" = yes ; then
# Our simple test case # Our simple test case
cat > $TMPC << EOF cat > $TMPC << EOF
int main(void) { return 0; } int main(void) { return 0; }
EOF EOF
_opengl_game=no _opengl_game=no
# Try different library names # Try different library names
if test "$_opengles2" = yes ; then if test "$_opengl_game_es2" = yes ; then
# 1) GLESv2 This is generally used by nearly all platforms for OpenGL ES 2 # 1) GLESv2 This is generally used by nearly all platforms for OpenGL ES 2
# 2) ogles2 This is used by AmigaOS4 (and probably others) # 2) ogles2 This is used by AmigaOS4 (and probably others)
_opengles2=no _opengl_game_es2=no
for lib in "-lGLESv2" "-logles2"; do for lib in "-lGLESv2" "-logles2"; do
if cc_check_no_clean $DEFINES $OPENGL_CFLAGS $OPENGL_LIBS $lib if cc_check_no_clean $DEFINES $OPENGL_CFLAGS $OPENGL_LIBS $lib
then then
_opengles2=yes _opengl_game_es2=yes
append_var OPENGL_LIBS "$lib" append_var OPENGL_LIBS "$lib"
append_var LIBS_3D "$OPENGL_LIBS"
break break
fi fi
done done
@ -5447,43 +5447,36 @@ EOF
append_var LIBS "$OPENGL_LIBS" append_var LIBS "$OPENGL_LIBS"
append_var INCLUDES "$OPENGL_CFLAGS" append_var INCLUDES "$OPENGL_CFLAGS"
append_var LIBS_3D "$OPENGL_LIBS" append_var LIBS_3D "$OPENGL_LIBS"
if test "$_opengl_shaders" = auto; then _opengl_game_classic=yes
_opengl_shaders=$_glew if test "$_opengl_game_shaders" = auto; then
_opengl_game_shaders=$_glew
fi fi
if test "$_opengl_shaders" = yes && test "$_opengles2" = no && test "$_glew" = no; then if test "$_opengl_game_shaders" = yes && test "$_opengl_game_es2" = no && test "$_glew" = no; then
echo "WARNING: OpenGL Shader support requires GLEW!" echo "WARNING: OpenGL Shader support requires GLEW!"
_opengl_shaders=no _opengl_game_shaders=no
fi fi
else else
_opengl_shaders=no _opengl_game_shaders=no
fi fi
cc_check_clean cc_check_clean
fi fi
# If 2d sdl gfx backend has no opengl we will not enable opengl in games due lack of gfx dynamic switch if test "$_opengl_game_es2" = "yes" ; then
if test "$_opengl" = "no" ; then
_opengl_game=no
_opengl_shaders=no
_opengles2=no
_glew=no
fi
if test "$_opengles2" = "yes" ; then
echo "yes (OpenGL ES2)" echo "yes (OpenGL ES2)"
else else
if test "$_opengl_shaders" = "yes" ; then if test "$_opengl_game_shaders" = "yes" ; then
echo "$_opengl_game (shaders enabled)" echo "yes (shaders enabled)"
elif test "$_opengl" = "yes" ; then elif test "$_opengl_game_classic" = "yes" ; then
echo "$_opengl_game (shaders disabled)" echo "yes (shaders disabled)"
else else
echo "no" echo "no"
fi fi
fi fi
define_in_config_if_yes "$_opengl" "USE_OPENGL" define_in_config_if_yes "$_opengl" "USE_OPENGL"
define_in_config_if_yes "$_opengl_game" "USE_OPENGL_GAME" define_in_config_if_yes "$_opengl_game_classic" "USE_OPENGL_GAME"
define_in_config_if_yes "$_opengles2" "USE_GLES2" define_in_config_if_yes "$_opengl_game_shaders" "USE_OPENGL_SHADERS"
define_in_config_if_yes "$_opengl_shaders" "USE_OPENGL_SHADERS" define_in_config_if_yes "$_opengl_game_es2" "USE_GLES2"
# If we have OpenGL libraries, then add them to plugins # If we have OpenGL libraries, then add them to plugins
# so they could link # so they could link
@ -5491,6 +5484,7 @@ if test -n "$LIBS_3D" ; then
_mak_plugins=$_mak_plugins"PLUGIN_LDFLAGS += $LIBS_3D" _mak_plugins=$_mak_plugins"PLUGIN_LDFLAGS += $LIBS_3D"
fi fi
# #
# Check for iconv # Check for iconv
# #

2
engines/grim/grim.cpp
View file

@ -42,7 +42,7 @@
#include "graphics/pixelbuffer.h" #include "graphics/pixelbuffer.h"
#include "graphics/renderer.h" #include "graphics/renderer.h"
#ifdef USE_OPENGL_GAME #if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "graphics/opengl/context.h" #include "graphics/opengl/context.h"
#endif #endif

2
engines/myst3/gfx.cpp
View file

@ -29,7 +29,7 @@
#include "graphics/renderer.h" #include "graphics/renderer.h"
#include "graphics/surface.h" #include "graphics/surface.h"
#ifdef USE_OPENGL_GAME #if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "graphics/opengl/context.h" #include "graphics/opengl/context.h"
#endif #endif

2
engines/stark/configure.engine
View file

@ -1,3 +1,3 @@
# This file is included from the main "configure" script # This file is included from the main "configure" script
# add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps] # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
add_engine stark "The Longest Journey" yes "" "" "freetype2 opengl_shaders vorbis" add_engine stark "The Longest Journey" yes "" "" "freetype2 opengl_game_shaders vorbis"

2
engines/stark/gfx/driver.cpp
View file

@ -26,7 +26,7 @@
#include "common/config-manager.h" #include "common/config-manager.h"
#include "graphics/surface.h" #include "graphics/surface.h"
#ifdef USE_OPENGL_GAME #if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "graphics/opengl/context.h" #include "graphics/opengl/context.h"
#endif #endif

6
engines/wintermute/base/base_game.cpp
View file

@ -504,16 +504,16 @@ bool BaseGame::initialize2() { // we know whether we are going to be accelerated
Common::String rendererConfig = ConfMan.get("renderer"); Common::String rendererConfig = ConfMan.get("renderer");
Graphics::RendererType desiredRendererType = Graphics::parseRendererTypeCode(rendererConfig); Graphics::RendererType desiredRendererType = Graphics::parseRendererTypeCode(rendererConfig);
#if defined(USE_OPENGL_SHADERS) #if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
if (desiredRendererType == Graphics::kRendererTypeOpenGLShaders) { if (desiredRendererType == Graphics::kRendererTypeOpenGLShaders) {
_renderer3D = makeOpenGL3DShaderRenderer(this); _renderer3D = makeOpenGL3DShaderRenderer(this);
} }
#endif // defined(USE_GLES2) || defined(USE_OPENGL_SHADERS) #endif // defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2) #if defined(USE_OPENGL_GAME)
if (desiredRendererType == Graphics::kRendererTypeOpenGL) { if (desiredRendererType == Graphics::kRendererTypeOpenGL) {
_renderer3D = makeOpenGL3DRenderer(this); _renderer3D = makeOpenGL3DRenderer(this);
} }
#endif // defined(USE_OPENGL) && !defined(USE_GLES2) #endif // defined(USE_OPENGL)
if (desiredRendererType == Graphics::kRendererTypeTinyGL) { if (desiredRendererType == Graphics::kRendererTypeTinyGL) {
// TODO // TODO
//_renderer3D = makeTinyGL3DRenderer(this); //_renderer3D = makeTinyGL3DRenderer(this);

2
engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
View file

@ -29,7 +29,7 @@
#include "graphics/opengl/system_headers.h" #include "graphics/opengl/system_headers.h"
#include "math/glmath.h" #include "math/glmath.h"
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2) #if (defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS)) && !defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h" #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
#include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h" #include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h"

2
engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
View file

@ -31,7 +31,7 @@
#include "math/matrix4.h" #include "math/matrix4.h"
#include "math/ray.h" #include "math/ray.h"
#if defined(USE_OPENGL) && !defined(USE_GLES2) #if (defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS)) && !defined(USE_GLES2)
#include "graphics/opengl/system_headers.h" #include "graphics/opengl/system_headers.h"
#include "graphics/opengl/texture.h" #include "graphics/opengl/texture.h"

2
engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
View file

@ -28,7 +28,7 @@
#include "graphics/opengl/system_headers.h" #include "graphics/opengl/system_headers.h"
#include "math/glmath.h" #include "math/glmath.h"
#if defined(USE_OPENGL_SHADERS) #if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h" #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h"
#include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h" #include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h"

2
engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
View file

@ -33,7 +33,7 @@
#include "math/matrix4.h" #include "math/matrix4.h"
#include "math/ray.h" #include "math/ray.h"
#if defined(USE_OPENGL_SHADERS) #if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "graphics/opengl/shader.h" #include "graphics/opengl/shader.h"

2
engines/wintermute/base/gfx/opengl/base_render_opengl_texture.cpp
View file

@ -36,7 +36,7 @@
#include "common/config-manager.h" #include "common/config-manager.h"
#include "graphics/transparent_surface.h" #include "graphics/transparent_surface.h"
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2) #if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "graphics/opengl/texture.h" #include "graphics/opengl/texture.h"
#include "graphics/opengl/surfacerenderer.h" #include "graphics/opengl/surfacerenderer.h"

2
engines/wintermute/base/gfx/opengl/base_render_opengl_texture.h
View file

@ -35,7 +35,7 @@
#include "common/list.h" #include "common/list.h"
#include "graphics/transform_struct.h" #include "graphics/transform_struct.h"
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2) #if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
namespace Wintermute { namespace Wintermute {
class BaseSurfaceOpenGLTexture; class BaseSurfaceOpenGLTexture;

2
engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
View file

@ -24,7 +24,7 @@
#include "engines/wintermute/base/gfx/base_image.h" #include "engines/wintermute/base/gfx/base_image.h"
#include "graphics/transparent_surface.h" #include "graphics/transparent_surface.h"
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2) #if (defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS)) && !defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h" #include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h"
#include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h" #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"

2
engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
View file

@ -26,7 +26,7 @@
#include "engines/wintermute/base/gfx/base_surface.h" #include "engines/wintermute/base/gfx/base_surface.h"
#include "graphics/opengl/texture.h" #include "graphics/opengl/texture.h"
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2) #if (defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS)) && !defined(USE_GLES2)
namespace Wintermute { namespace Wintermute {

2
engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.cpp
View file

@ -38,7 +38,7 @@
#include "common/stream.h" #include "common/stream.h"
#include "common/system.h" #include "common/system.h"
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2) #if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.h" #include "engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.h"
#include "engines/wintermute/base/gfx/opengl/base_render_opengl_texture.h" #include "engines/wintermute/base/gfx/opengl/base_render_opengl_texture.h"

2
engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.h
View file

@ -34,7 +34,7 @@
#include "engines/wintermute/base/gfx/base_surface.h" #include "engines/wintermute/base/gfx/base_surface.h"
#include "common/list.h" #include "common/list.h"
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2) #if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
namespace Wintermute { namespace Wintermute {
struct TransparentSurface; struct TransparentSurface;

2
engines/wintermute/base/gfx/opengl/mesh3ds_opengl.cpp
View file

@ -23,7 +23,7 @@
#include "engines/wintermute/wintypes.h" #include "engines/wintermute/wintypes.h"
#include "graphics/opengl/system_headers.h" #include "graphics/opengl/system_headers.h"
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2) #if (defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS)) && !defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h" #include "engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h"

2
engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h
View file

@ -25,7 +25,7 @@
#include "engines/wintermute/base/gfx/3ds/mesh3ds.h" #include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2) #if (defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS)) && !defined(USE_GLES2)
namespace Wintermute { namespace Wintermute {

2
engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.cpp
View file

@ -23,7 +23,7 @@
#include "engines/wintermute/wintypes.h" #include "engines/wintermute/wintypes.h"
#include "graphics/opengl/system_headers.h" #include "graphics/opengl/system_headers.h"
#if defined(USE_OPENGL_SHADERS) #if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h" #include "engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h"

2
engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h
View file

@ -25,7 +25,7 @@
#include "engines/wintermute/base/gfx/3ds/mesh3ds.h" #include "engines/wintermute/base/gfx/3ds/mesh3ds.h"
#if defined(USE_OPENGL_SHADERS) #if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "graphics/opengl/shader.h" #include "graphics/opengl/shader.h"

2
engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
View file

@ -29,7 +29,7 @@
#include "engines/wintermute/base/gfx/x/material.h" #include "engines/wintermute/base/gfx/x/material.h"
#include "graphics/opengl/system_headers.h" #include "graphics/opengl/system_headers.h"
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2) #if (defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS)) && !defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h" #include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h"
#include "engines/wintermute/base/gfx/opengl/meshx_opengl.h" #include "engines/wintermute/base/gfx/opengl/meshx_opengl.h"

2
engines/wintermute/base/gfx/opengl/meshx_opengl.h
View file

@ -31,7 +31,7 @@
#include "engines/wintermute/base/gfx/x/meshx.h" #include "engines/wintermute/base/gfx/x/meshx.h"
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2) #if (defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS)) && !defined(USE_GLES2)
namespace Wintermute { namespace Wintermute {

2
engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
View file

@ -29,7 +29,7 @@
#include "engines/wintermute/base/gfx/x/material.h" #include "engines/wintermute/base/gfx/x/material.h"
#include "graphics/opengl/system_headers.h" #include "graphics/opengl/system_headers.h"
#if defined(USE_OPENGL_SHADERS) #if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h" #include "engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h"
#include "engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h" #include "engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h"

2
engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
View file

@ -31,7 +31,7 @@
#include "engines/wintermute/base/gfx/x/meshx.h" #include "engines/wintermute/base/gfx/x/meshx.h"
#if defined(USE_OPENGL_SHADERS) #if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "graphics/opengl/shader.h" #include "graphics/opengl/shader.h"

2
engines/wintermute/base/gfx/opengl/render_ticket.cpp
View file

@ -31,7 +31,7 @@
#include "graphics/transform_tools.h" #include "graphics/transform_tools.h"
#include "common/textconsole.h" #include "common/textconsole.h"
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2) #if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/render_ticket.h" #include "engines/wintermute/base/gfx/opengl/render_ticket.h"
#include "engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.h" #include "engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.h"

2
engines/wintermute/base/gfx/opengl/render_ticket.h
View file

@ -33,7 +33,7 @@
#include "graphics/surface.h" #include "graphics/surface.h"
#include "common/rect.h" #include "common/rect.h"
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2) #if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
namespace Wintermute { namespace Wintermute {

2
engines/wintermute/base/gfx/opengl/shadow_volume_opengl.cpp
View file

@ -30,7 +30,7 @@
#include "engines/wintermute/dcgf.h" #include "engines/wintermute/dcgf.h"
#include "graphics/opengl/system_headers.h" #include "graphics/opengl/system_headers.h"
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2) #if (defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS)) && !defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h" #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
#include "engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h" #include "engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h"

2
engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h
View file

@ -31,7 +31,7 @@
#include "engines/wintermute/base/gfx/shadow_volume.h" #include "engines/wintermute/base/gfx/shadow_volume.h"
#if defined(USE_OPENGL_GAME) && !defined(USE_GLES2) #if (defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS)) && !defined(USE_GLES2)
namespace Wintermute { namespace Wintermute {

2
engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
View file

@ -30,7 +30,7 @@
#include "engines/wintermute/dcgf.h" #include "engines/wintermute/dcgf.h"
#include "graphics/opengl/system_headers.h" #include "graphics/opengl/system_headers.h"
#if defined(USE_OPENGL_SHADERS) #if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h" #include "engines/wintermute/base/gfx/opengl/base_render_opengl3d.h"
#include "engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h" #include "engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h"

2
engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h
View file

@ -32,7 +32,7 @@
#include "engines/wintermute/base/gfx/shadow_volume.h" #include "engines/wintermute/base/gfx/shadow_volume.h"
#include "graphics/opengl/system_headers.h" #include "graphics/opengl/system_headers.h"
#if defined(USE_OPENGL_SHADERS) #if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "graphics/opengl/shader.h" #include "graphics/opengl/shader.h"