[Scummvm-git-logs] scummvm master -> b87fb7c70dbea50a0e5bbcab387c2765c753af31

[aquadran]

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:
b87fb7c70d WME: Fixed opengl ifdef guards. Synced glew flag with opengl in configure.


Commit: b87fb7c70dbea50a0e5bbcab387c2765c753af31
    https://github.com/scummvm/scummvm/commit/b87fb7c70dbea50a0e5bbcab387c2765c753af31
Author: Paweł Kołodziejski (aquadran at users.sourceforge.net)
Date: 2020-10-09T20:56:48+02:00

Commit Message:
WME: Fixed opengl ifdef guards. Synced glew flag with opengl in configure.

Changed paths:
    configure
    engines/wintermute/base/gfx/base_renderer3d.h
    engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
    engines/wintermute/base/gfx/opengl/base_render_opengl_texture.cpp


diff --git a/configure b/configure
index fd87a67a4a..34acce57a5 100755
--- a/configure
+++ b/configure
@@ -5489,6 +5489,7 @@ if test "$_opengl" = "no" || test "$_opengl_game" = "no" ; then
 	_opengl_game=no
 	_opengles=no
 	_opengles2=no
+	_glew=no
 fi
 
 if test "$_opengles" = "yes" ; then
diff --git a/engines/wintermute/base/gfx/base_renderer3d.h b/engines/wintermute/base/gfx/base_renderer3d.h
index adca76c956..8f27061da2 100644
--- a/engines/wintermute/base/gfx/base_renderer3d.h
+++ b/engines/wintermute/base/gfx/base_renderer3d.h
@@ -28,12 +28,17 @@
 #include "engines/wintermute/dctypes.h"
 #include "engines/wintermute/math/rect32.h"
 #include "engines/wintermute/math/vector2.h"
-#include "graphics/opengl/system_headers.h"
-#include "graphics/opengl/texture.h"
 #include "graphics/transform_struct.h"
 #include "math/matrix4.h"
 #include "math/ray.h"
 
+#if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
+
+#include "graphics/opengl/system_headers.h"
+#include "graphics/opengl/texture.h"
+
+#endif
+
 namespace Wintermute {
 
 class AdBlock;
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
index 663acaad05..fbbd260fca 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.h
@@ -27,14 +27,15 @@
 #include "engines/wintermute/math/rect32.h"
 #include "engines/wintermute/math/vector2.h"
 #include "engines/wintermute/dctypes.h"
-#include "graphics/opengl/system_headers.h"
-#include "graphics/opengl/texture.h"
 #include "graphics/transform_struct.h"
 #include "math/matrix4.h"
 #include "math/ray.h"
 
 #if defined(USE_OPENGL) && !defined(USE_GLES2)
 
+#include "graphics/opengl/system_headers.h"
+#include "graphics/opengl/texture.h"
+
 namespace Wintermute {
 
 class BaseSurfaceOpenGL3D;
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 396a835675..3f58248b28 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl_texture.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl_texture.cpp
@@ -35,11 +35,11 @@
 #include "common/queue.h"
 #include "common/config-manager.h"
 #include "graphics/transparent_surface.h"
-#include "graphics/opengl/texture.h"
-#include "graphics/opengl/surfacerenderer.h"
 
 #if defined(USE_OPENGL) && !defined(USE_GLES2)
 
+#include "graphics/opengl/texture.h"
+#include "graphics/opengl/surfacerenderer.h"
 #include "engines/wintermute/base/gfx/opengl/base_render_opengl_texture.h"
 #include "engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.h"
 #include "engines/wintermute/base/gfx/opengl/render_ticket.h"