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

aquadran aquadran at gmail.com
Sun Oct 18 20:23:06 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:
ad37c20fb4 WINTERMUTE: Attempt enabling GLES2 renderer.


Commit: ad37c20fb455bdda35e3eb66ddb6931fa9489b8a
    https://github.com/scummvm/scummvm/commit/ad37c20fb455bdda35e3eb66ddb6931fa9489b8a
Author: Paweł Kołodziejski (aquadran at users.sourceforge.net)
Date: 2020-10-18T22:22:57+02:00

Commit Message:
WINTERMUTE: Attempt enabling GLES2 renderer.

Changed paths:
    engines/wintermute/base/base_game.cpp
    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_opengl_texture.cpp
    engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.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_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_shader.cpp
    engines/wintermute/base/gfx/opengl/shadow_volume_opengl_shader.h


diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index 3121f4c579..a17cc1fd2e 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -504,7 +504,7 @@ 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)// || defined(USE_GLES2)
+#if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
 	if (desiredRendererType == Graphics::kRendererTypeOpenGLShaders) {
 		_renderer3D = makeOpenGL3DShaderRenderer(this);
 	}
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 50a79dd380..0e3223ccb5 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)// || defined(USE_GLES2)
+#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 3c87cdeca9..ac7586a026 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)// || defined(USE_GLES2)
+#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 7553dcae22..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_OPENGL_SHADERS)// || 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 d6c091d0c5..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_OPENGL_SHADERS)// || 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_opengl_texture.cpp b/engines/wintermute/base/gfx/opengl/base_surface_opengl_texture.cpp
index af06ccac3f..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_OPENGL_SHADERS)// || 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 aa5c4cfcbe..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_OPENGL_SHADERS)// || 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_shader.cpp b/engines/wintermute/base/gfx/opengl/mesh3ds_opengl_shader.cpp
index d83dfee57b..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)// || defined(USE_GLES2)
+#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 c4a32905d3..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)// || defined(USE_GLES2)
+#if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
 
 #include "graphics/opengl/shader.h"
 
diff --git a/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp b/engines/wintermute/base/gfx/opengl/meshx_opengl_shader.cpp
index aeab7a561f..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)// || defined(USE_GLES2)
+#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 acce7735e7..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)// || defined(USE_GLES2)
+#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 ac71b03acd..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_OPENGL_SHADERS)// || 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 2960b9b025..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_OPENGL_SHADERS)// || 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 9884a6814f..edb10730e1 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)// || defined(USE_GLES2)
+#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 d94f24e705..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)// || defined(USE_GLES2)
+#if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
 
 #include "graphics/opengl/shader.h"

More information about the Scummvm-git-logs mailing list