[Scummvm-git-logs] scummvm master -> a37173807fc3754e1262f2fe29e9851552ef54b1
aquadran
aquadran at gmail.com
Wed Oct 14 16:37:25 UTC 2020
This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
a37173807f CONFIGURE: More work on opengl flags
Commit: a37173807fc3754e1262f2fe29e9851552ef54b1
https://github.com/scummvm/scummvm/commit/a37173807fc3754e1262f2fe29e9851552ef54b1
Author: Paweł Kołodziejski (aquadran at users.sourceforge.net)
Date: 2020-10-14T18:37:17+02:00
Commit Message:
CONFIGURE: More work on opengl flags
Changed paths:
backends/platform/sdl/sdl.cpp
backends/platform/sdl/sdl.h
configure
engines/grim/grim.cpp
engines/myst3/gfx.cpp
engines/stark/configure.engine
engines/stark/gfx/driver.cpp
engines/wintermute/base/base_game.cpp
engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
engines/wintermute/base/gfx/opengl/base_render_opengl_texture.cpp
engines/wintermute/base/gfx/opengl/base_render_opengl_texture.h
engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.cpp
engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.h
engines/wintermute/base/gfx/opengl/mesh3ds_opengl.cpp
engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h
engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.cpp
engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h
engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
engines/wintermute/base/gfx/opengl/meshx_opengl.h
engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
engines/wintermute/base/gfx/opengl/render_ticket.cpp
engines/wintermute/base/gfx/opengl/render_ticket.h
engines/wintermute/base/gfx/opengl/shadow_volume_opengl.cpp
engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h
engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 80fb5155ce..9e30947b59 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -216,7 +216,7 @@ void OSystem_SDL::initBackend() {
#endif
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();
detectAntiAliasingSupport();
#endif
diff --git a/backends/platform/sdl/sdl.h b/backends/platform/sdl/sdl.h
index d1e4fdc5bd..82ff5ac1c6 100644
--- a/backends/platform/sdl/sdl.h
+++ b/backends/platform/sdl/sdl.h
@@ -36,7 +36,7 @@
#ifdef USE_DISCORD
class DiscordPresence;
#endif
-#ifdef USE_OPENGL_GAME
+#if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "backends/graphics3d/openglsdl/openglsdl-graphics3d.h"
#endif
@@ -90,7 +90,7 @@ public:
//Screenshots
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;
#endif
@@ -128,7 +128,7 @@ protected:
SdlGraphicsManager::State _gfxManagerState;
-#ifdef USE_OPENGL_GAME
+#if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
// Graphics capabilities
void detectFramebufferSupport();
void detectAntiAliasingSupport();
diff --git a/configure b/configure
index cff784b45e..87a6b2d45a 100755
--- a/configure
+++ b/configure
@@ -161,8 +161,9 @@ _fluidsynth=auto
_glew=auto
_opengl_mode=auto
_opengl_game=auto
-_opengles2=no
-_opengl_shaders=auto
+_opengl_game_classic=no
+_opengl_game_shaders=auto
+_opengl_game_es2=no
_readline=auto
_freetype2=auto
_taskbar=auto
@@ -266,7 +267,7 @@ add_feature highres "high resolution" "_highres"
add_feature mad "MAD" "_mad"
add_feature jpeg "JPEG" "_jpeg"
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 theoradec "libtheoradec" "_theoradec"
add_feature vorbis "Vorbis file support" "_vorbis _tremor"
@@ -1110,10 +1111,10 @@ Optional Libraries:
--with-a52-prefix=DIR Prefix where liba52 is installed (optional)
--enable-a52 enable a52 codec for MPEG decoder [autodetect]
- --with-opengl-prefix=DIR prefix where OpenGL (ES) is installed (optional)
- --disable-opengl-game disable OpenGL (ES) support in game [autodetect]
- --disable-opengl-shaders disable use of modern OpenGL with shaders
- --force-opengles2 only detect OpenGL ES2
+ --with-opengl-prefix=DIR prefix where OpenGL (ES) is installed (optional)
+ --disable-opengl-game disable OpenGL (ES) support in game [autodetect]
+ --disable-opengl-game-shaders disable use of modern OpenGL with shaders
+ --force-opengl-game-es2 only detect OpenGL ES2
--with-glew-prefix=DIR prefix where GLEW is installed (optional)
--disable-glew disable GLEW support [autodetect]
@@ -1317,11 +1318,9 @@ for ac_option in $@; do
--disable-gtk) _gtk=no ;;
--enable-glew) _glew=yes ;;
--disable-glew) _glew=no ;;
- --enable-opengl-game) _opengl_game=yes ;;
--disable-opengl-game) _opengl_game=no ;;
- --enable-opengl-shaders) _opengl_shaders=yes ;;
- --disable-opengl-shaders) _opengl_shaders=no ;;
- --force-opengles2) _opengles2=yes ;;
+ --disable-opengl-game-shaders) _opengl_game_shaders=no ;;
+ --force-opengl-game-es2) _opengl_game_es2=yes ;;
--enable-bink) _bink=yes ;;
--disable-bink) _bink=no ;;
--enable-discord) _discord=yes ;;
@@ -5234,51 +5233,6 @@ echo "$_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)
#
@@ -5371,22 +5325,68 @@ case $_opengl_mode in
;;
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
#
echocheck "OpenGL for game"
-if test "$_opengl_game" = auto ; then
+if test "$_opengl_game" = auto && test "$_opengl" = yes ; then
_opengl_game=no
if test "$_backend" = "sdl" || test "$_backend" = "android"; then
# Try different header filenames
# 1) GL/gl.h This is usually used on POSIX and Windows systems
# 2) OpenGL/gl.h This is used on Mac OS 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" "GLES/gl.h"; do
+ for i in "GL/gl.h" "OpenGL/gl.h" "GLES2/gl2.h"; do
# Test the current header for OpenGL
- if test "$_opengles2" = no ; then
+ if test "$_opengl_game_es2" = no ; then
cat > $TMPC << EOF
#include <$i>
#include <stdio.h>
@@ -5400,28 +5400,28 @@ EOF
#include <$i>
int main(void) { return GL_ES_VERSION_2_0; }
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
fi
fi
-if test "$_opengl_game" = yes ; then
+if test "$_opengl_game" = yes && test "$_opengl" = yes ; then
# Our simple test case
cat > $TMPC << EOF
int main(void) { return 0; }
EOF
-
_opengl_game=no
# 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
# 2) ogles2 This is used by AmigaOS4 (and probably others)
- _opengles2=no
+ _opengl_game_es2=no
for lib in "-lGLESv2" "-logles2"; do
if cc_check_no_clean $DEFINES $OPENGL_CFLAGS $OPENGL_LIBS $lib
then
- _opengles2=yes
+ _opengl_game_es2=yes
append_var OPENGL_LIBS "$lib"
+ append_var LIBS_3D "$OPENGL_LIBS"
break
fi
done
@@ -5447,43 +5447,36 @@ EOF
append_var LIBS "$OPENGL_LIBS"
append_var INCLUDES "$OPENGL_CFLAGS"
append_var LIBS_3D "$OPENGL_LIBS"
- if test "$_opengl_shaders" = auto; then
- _opengl_shaders=$_glew
+ _opengl_game_classic=yes
+ if test "$_opengl_game_shaders" = auto; then
+ _opengl_game_shaders=$_glew
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!"
- _opengl_shaders=no
+ _opengl_game_shaders=no
fi
else
- _opengl_shaders=no
+ _opengl_game_shaders=no
fi
cc_check_clean
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" = "no" ; then
- _opengl_game=no
- _opengl_shaders=no
- _opengles2=no
- _glew=no
-fi
-
-if test "$_opengles2" = "yes" ; then
+if test "$_opengl_game_es2" = "yes" ; then
echo "yes (OpenGL ES2)"
else
- if test "$_opengl_shaders" = "yes" ; then
- echo "$_opengl_game (shaders enabled)"
- elif test "$_opengl" = "yes" ; then
- echo "$_opengl_game (shaders disabled)"
+ if test "$_opengl_game_shaders" = "yes" ; then
+ echo "yes (shaders enabled)"
+ elif test "$_opengl_game_classic" = "yes" ; then
+ echo "yes (shaders disabled)"
else
echo "no"
fi
fi
define_in_config_if_yes "$_opengl" "USE_OPENGL"
-define_in_config_if_yes "$_opengl_game" "USE_OPENGL_GAME"
-define_in_config_if_yes "$_opengles2" "USE_GLES2"
-define_in_config_if_yes "$_opengl_shaders" "USE_OPENGL_SHADERS"
+define_in_config_if_yes "$_opengl_game_classic" "USE_OPENGL_GAME"
+define_in_config_if_yes "$_opengl_game_shaders" "USE_OPENGL_SHADERS"
+define_in_config_if_yes "$_opengl_game_es2" "USE_GLES2"
# If we have OpenGL libraries, then add them to plugins
# so they could link
@@ -5491,6 +5484,7 @@ if test -n "$LIBS_3D" ; then
_mak_plugins=$_mak_plugins"PLUGIN_LDFLAGS += $LIBS_3D"
fi
+
#
# Check for iconv
#
diff --git a/engines/grim/grim.cpp b/engines/grim/grim.cpp
index 8ece967933..8f4befdc7e 100644
--- a/engines/grim/grim.cpp
+++ b/engines/grim/grim.cpp
@@ -42,7 +42,7 @@
#include "graphics/pixelbuffer.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"
#endif
diff --git a/engines/myst3/gfx.cpp b/engines/myst3/gfx.cpp
index 482f1265d5..0833c49427 100644
--- a/engines/myst3/gfx.cpp
+++ b/engines/myst3/gfx.cpp
@@ -29,7 +29,7 @@
#include "graphics/renderer.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"
#endif
diff --git a/engines/stark/configure.engine b/engines/stark/configure.engine
index c47e8d9a79..146c24f0f7 100644
--- a/engines/stark/configure.engine
+++ b/engines/stark/configure.engine
@@ -1,3 +1,3 @@
# This file is included from the main "configure" script
# 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"
diff --git a/engines/stark/gfx/driver.cpp b/engines/stark/gfx/driver.cpp
index f20ef35abd..218c543368 100644
--- a/engines/stark/gfx/driver.cpp
+++ b/engines/stark/gfx/driver.cpp
@@ -26,7 +26,7 @@
#include "common/config-manager.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"
#endif
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 887e5fa6a2..a17cc1fd2e 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -504,16 +504,16 @@ bool BaseGame::initialize2() { // we know whether we are going to be accelerated
Common::String rendererConfig = ConfMan.get("renderer");
Graphics::RendererType desiredRendererType = Graphics::parseRendererTypeCode(rendererConfig);
-#if defined(USE_OPENGL_SHADERS)
+#if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
if (desiredRendererType == Graphics::kRendererTypeOpenGLShaders) {
_renderer3D = makeOpenGL3DShaderRenderer(this);
}
#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) {
_renderer3D = makeOpenGL3DRenderer(this);
}
-#endif // defined(USE_OPENGL) && !defined(USE_GLES2)
+#endif // defined(USE_OPENGL)
if (desiredRendererType == Graphics::kRendererTypeTinyGL) {
// TODO
//_renderer3D = makeTinyGL3DRenderer(this);
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
index aa412172f9..d68a887bd3 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -29,7 +29,7 @@
#include "graphics/opengl/system_headers.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_surface_opengl3d.h"
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
index 39237e1475..eec078fcd6 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
@@ -31,7 +31,7 @@
#include "math/matrix4.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/texture.h"
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
index a522984f37..b91910f363 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -28,7 +28,7 @@
#include "graphics/opengl/system_headers.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_surface_opengl3d.h"
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
index be910b348e..291f4a3412 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.h
@@ -33,7 +33,7 @@
#include "math/matrix4.h"
#include "math/ray.h"
-#if defined(USE_OPENGL_SHADERS)
+#if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
#include "graphics/opengl/shader.h"
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl_texture.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl_texture.cpp
index fd84f204db..c957751076 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl_texture.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl_texture.cpp
@@ -36,7 +36,7 @@
#include "common/config-manager.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/surfacerenderer.h"
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl_texture.h b/engines/wintermute/base/gfx/opengl/base_render_opengl_texture.h
index ba13fff404..a9ae25976a 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl_texture.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl_texture.h
@@ -35,7 +35,7 @@
#include "common/list.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 {
class BaseSurfaceOpenGLTexture;
diff --git a/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
index 867110b88a..fd8212edd9 100644
--- a/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.cpp
@@ -24,7 +24,7 @@
#include "engines/wintermute/base/gfx/base_image.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_render_opengl3d.h"
diff --git a/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h b/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
index 920fb2f338..4ca9bafef3 100644
--- a/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
+++ b/engines/wintermute/base/gfx/opengl/base_surface_opengl3d.h
@@ -26,7 +26,7 @@
#include "engines/wintermute/base/gfx/base_surface.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 {
diff --git a/engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.cpp b/engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.cpp
index 5ea4dacb83..b95e039af9 100644
--- a/engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.cpp
@@ -38,7 +38,7 @@
#include "common/stream.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_render_opengl_texture.h"
diff --git a/engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.h b/engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.h
index f6c94a3e37..4affea268e 100644
--- a/engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.h
+++ b/engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.h
@@ -34,7 +34,7 @@
#include "engines/wintermute/base/gfx/base_surface.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 {
struct TransparentSurface;
diff --git a/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.cpp b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.cpp
index 7a95c581c1..17fa15d3d8 100644
--- a/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.cpp
+++ b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.cpp
@@ -23,7 +23,7 @@
#include "engines/wintermute/wintypes.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"
diff --git a/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h
index 39e1d0b384..95f56691b5 100644
--- a/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h
+++ b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl.h
@@ -25,7 +25,7 @@
#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 {
diff --git a/engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.cpp b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.cpp
index 8d4ea319ae..a681179c1a 100644
--- a/engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.cpp
@@ -23,7 +23,7 @@
#include "engines/wintermute/wintypes.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"
diff --git a/engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h
index cd2ff7516a..e3a1d7fac1 100644
--- a/engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h
+++ b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.h
@@ -25,7 +25,7 @@
#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"
diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp b/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
index 3acc8dd65d..6381e52d75 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl.cpp
@@ -29,7 +29,7 @@
#include "engines/wintermute/base/gfx/x/material.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/meshx_opengl.h"
diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl.h b/engines/wintermute/base/gfx/opengl/meshx_opengl.h
index edfed5f533..c7fb0a4133 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl.h
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl.h
@@ -31,7 +31,7 @@
#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 {
diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
index 24916bf5af..a53ed5a941 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
@@ -29,7 +29,7 @@
#include "engines/wintermute/base/gfx/x/material.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/meshx_opengl_shader.h"
diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
index 287bb40201..5f9b2a5caf 100644
--- a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
+++ b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.h
@@ -31,7 +31,7 @@
#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"
diff --git a/engines/wintermute/base/gfx/opengl/render_ticket.cpp b/engines/wintermute/base/gfx/opengl/render_ticket.cpp
index bddc614f47..0786cf2229 100644
--- a/engines/wintermute/base/gfx/opengl/render_ticket.cpp
+++ b/engines/wintermute/base/gfx/opengl/render_ticket.cpp
@@ -31,7 +31,7 @@
#include "graphics/transform_tools.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/base_surface_opengl_texture.h"
diff --git a/engines/wintermute/base/gfx/opengl/render_ticket.h b/engines/wintermute/base/gfx/opengl/render_ticket.h
index 8c156fc18a..5452f56c0f 100644
--- a/engines/wintermute/base/gfx/opengl/render_ticket.h
+++ b/engines/wintermute/base/gfx/opengl/render_ticket.h
@@ -33,7 +33,7 @@
#include "graphics/surface.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 {
diff --git a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl.cpp b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl.cpp
index 26a72eeaa4..6859c883de 100644
--- a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl.cpp
+++ b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl.cpp
@@ -30,7 +30,7 @@
#include "engines/wintermute/dcgf.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/shadow_volume_opengl.h"
diff --git a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h
index 3b021ab3ec..c7a8de864b 100644
--- a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h
+++ b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl.h
@@ -31,7 +31,7 @@
#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 {
diff --git a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
index 4e7e5c8318..95e3fa3332 100644
--- a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.cpp
@@ -30,7 +30,7 @@
#include "engines/wintermute/dcgf.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/shadow_volume_opengl_shader.h"
diff --git a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h
index daa22c2bb2..0ee85074d4 100644
--- a/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h
+++ b/engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h
@@ -32,7 +32,7 @@
#include "engines/wintermute/base/gfx/shadow_volume.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"
More information about the Scummvm-git-logs
mailing list