[Scummvm-git-logs] scummvm branch-2-5 -> 8c6e557c4c2b54ad2d94b71ff13da7fd1c9890cb

[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:
8c6e557c4c ENGINES: Allow to build without TINYGL enabled


Commit: 8c6e557c4c2b54ad2d94b71ff13da7fd1c9890cb
    https://github.com/scummvm/scummvm/commit/8c6e557c4c2b54ad2d94b71ff13da7fd1c9890cb
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2021-12-05T00:17:24+01:00

Commit Message:
ENGINES: Allow to build without TINYGL enabled

Changed paths:
    engines/grim/configure.engine
    engines/grim/gfx_base.cpp
    engines/grim/grim.cpp
    engines/grim/module.mk
    engines/myst3/configure.engine
    engines/myst3/gfx.cpp
    engines/myst3/module.mk
    engines/wintermute/base/base_game.cpp


diff --git a/engines/grim/configure.engine b/engines/grim/configure.engine
index f4805cb367..d161b24ebf 100644
--- a/engines/grim/configure.engine
+++ b/engines/grim/configure.engine
@@ -1,4 +1,4 @@
 # This file is included from the main "configure" script
 # add_engine [name] [desc] [build-by-default] [subengines] [base games] [deps]
-add_engine grim "Grim" yes "monkey4" "Grim Fandango" "tinygl 16bit highres zlib"
+add_engine grim "Grim" yes "monkey4" "Grim Fandango" "16bit highres zlib"
 add_engine monkey4 "Escape from Monkey Island" no "" "" "bink mpeg2"
diff --git a/engines/grim/gfx_base.cpp b/engines/grim/gfx_base.cpp
index 96e0a76c9f..8d50f33851 100644
--- a/engines/grim/gfx_base.cpp
+++ b/engines/grim/gfx_base.cpp
@@ -109,13 +109,6 @@ void GfxBase::drawMesh(const Mesh *mesh) {
 		mesh->_faces[i].draw(mesh);
 }
 
-#ifndef USE_OPENGL_GAME
-// Allow CreateGfxOpenGL to be called even if OpenGL isn't included
-GfxBase *CreateGfxOpenGL() {
-	return CreateGfxTinyGL();
-}
-#endif // USE_OPENGL_GAME
-
 Math::Matrix4 GfxBase::makeLookMatrix(const Math::Vector3d& pos, const Math::Vector3d& interest, const Math::Vector3d& up) {
 	Math::Vector3d f = (interest - pos).getNormalized();
 	Math::Vector3d u = up.getNormalized();
diff --git a/engines/grim/grim.cpp b/engines/grim/grim.cpp
index ac2f8b0d7e..500220b2a9 100644
--- a/engines/grim/grim.cpp
+++ b/engines/grim/grim.cpp
@@ -306,10 +306,11 @@ GfxBase *GrimEngine::createRenderer(int screenW, int screenH) {
 		renderer = CreateGfxOpenGL();
 	}
 #endif
+#if defined(USE_TINYGL)
 	if (matchingRendererType == Graphics::kRendererTypeTinyGL) {
 		renderer = CreateGfxTinyGL();
 	}
-
+#endif
 	if (!renderer) {
 		error("Unable to create a '%s' renderer", rendererConfig.c_str());
 	}
diff --git a/engines/grim/module.mk b/engines/grim/module.mk
index 7449df69fe..67607db9fb 100644
--- a/engines/grim/module.mk
+++ b/engines/grim/module.mk
@@ -100,7 +100,6 @@ MODULE_OBJS := \
 	debug.o \
 	font.o \
 	gfx_base.o \
-	gfx_tinygl.o \
 	gfx_opengl_shaders.o \
 	gfx_opengl.o \
 	grim.o \
@@ -143,6 +142,11 @@ MODULE_OBJS += \
 	movie/codecs/blocky8ARM.o
 endif
 
+ifdef USE_TINYGL
+MODULE_OBJS += \
+	gfx_tinygl.o
+endif
+
 # This module can be built as a plugin
 ifeq ($(ENABLE_GRIM), DYNAMIC_PLUGIN)
 PLUGIN := 1
diff --git a/engines/myst3/configure.engine b/engines/myst3/configure.engine
index f7435edb5e..a99a5dee48 100644
--- a/engines/myst3/configure.engine
+++ b/engines/myst3/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 myst3 "Myst 3" yes "" "" "tinygl 16bit highres jpeg bink"
+add_engine myst3 "Myst 3" yes "" "" "16bit highres jpeg bink"
diff --git a/engines/myst3/gfx.cpp b/engines/myst3/gfx.cpp
index 0935745020..87d9495e84 100644
--- a/engines/myst3/gfx.cpp
+++ b/engines/myst3/gfx.cpp
@@ -235,10 +235,11 @@ Renderer *createRenderer(OSystem *system) {
 		return CreateGfxOpenGL(system);
 	}
 #endif
+#if defined(USE_TINYGL)
 	if (matchingRendererType == Graphics::kRendererTypeTinyGL) {
 		return CreateGfxTinyGL(system);
 	}
-
+#endif
 	error("Unable to create a '%s' renderer", rendererConfig.c_str());
 }
 
diff --git a/engines/myst3/module.mk b/engines/myst3/module.mk
index 97bd47e34d..9b6825f6f2 100644
--- a/engines/myst3/module.mk
+++ b/engines/myst3/module.mk
@@ -9,10 +9,8 @@ MODULE_OBJS := \
 	effects.o \
 	gfx.o \
 	gfx_opengl.o \
-	gfx_tinygl.o \
 	gfx_opengl_shaders.o \
 	gfx_opengl_texture.o \
-	gfx_tinygl_texture.o \
 	hotspot.o \
 	inventory.o \
 	menu.o \
@@ -30,6 +28,12 @@ MODULE_OBJS := \
 	subtitles.o \
 	transition.o
 
+ifdef USE_TINYGL
+MODULE_OBJS += \
+	gfx_tinygl.o \
+	gfx_tinygl_texture.o
+endif
+
 # This module can be built as a plugin
 ifeq ($(ENABLE_MYST3), DYNAMIC_PLUGIN)
 PLUGIN := 1
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index d7be71e643..e16a96ece9 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -541,10 +541,12 @@ bool BaseGame::initialize2() { // we know whether we are going to be accelerated
 		_renderer3D = makeOpenGL3DRenderer(this);
 	}
 #endif // defined(USE_OPENGL)
+#if defined(USE_TINYGL)
 	if (_playing3DGame && matchingRendererType == Graphics::kRendererTypeTinyGL) {
 		_renderer3D = nullptr;// TODO: makeTinyGL3DRenderer(this);
 		error("3D software renderered is not supported yet");
 	}
+#endif
 	_renderer = _renderer3D;
 #if !defined(USE_OPENGL_GAME) && !defined(USE_OPENGL_SHADERS) && !defined(USE_GLES2)
 	if (!_playing3DGame && !_renderer3D)