[Scummvm-git-logs] scummvm master -> 42d55b24367486cb43156bca887962c029573797

[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:
42d55b2436 ENGINES: Drop accel3d param for initGraphics3d()


Commit: 42d55b24367486cb43156bca887962c029573797
    https://github.com/scummvm/scummvm/commit/42d55b24367486cb43156bca887962c029573797
Author: Paweł Kołodziejski (aquadran at users.sourceforge.net)
Date: 2020-10-13T22:49:07+02:00

Commit Message:
ENGINES: Drop accel3d param for initGraphics3d()

Changed paths:
    engines/engine.cpp
    engines/grim/grim.cpp
    engines/myst3/gfx.cpp
    engines/stark/gfx/driver.cpp
    engines/util.h
    engines/wintermute/base/base_game.cpp
    engines/wintermute/wintermute.cpp


diff --git a/engines/engine.cpp b/engines/engine.cpp
index d40e6fe337..239b07ea7f 100644
--- a/engines/engine.cpp
+++ b/engines/engine.cpp
@@ -395,9 +395,9 @@ void initGraphics(int width, int height) {
 	initGraphics(width, height, &format);
 }
 
-void initGraphics3d(int width, int height, bool fullscreen, bool accel3d) {
+void initGraphics3d(int width, int height, bool fullscreen) {
 	g_system->beginGFXTransaction();
-		g_system->setGraphicsMode(0, OSystem::kGfxModeRender3d | (accel3d ? OSystem::kGfxModeAcceleration3d : 0));
+		g_system->setGraphicsMode(0, OSystem::kGfxModeRender3d | OSystem::kGfxModeAcceleration3d);
 		g_system->initSize(width, height);
 		g_system->setFeatureState(OSystem::kFeatureFullscreenMode, fullscreen);
 	g_system->endGFXTransaction();
diff --git a/engines/grim/grim.cpp b/engines/grim/grim.cpp
index 35b9fa7030..0a52767ba0 100644
--- a/engines/grim/grim.cpp
+++ b/engines/grim/grim.cpp
@@ -270,7 +270,7 @@ GfxBase *GrimEngine::createRenderer(int screenW, int screenH, bool fullscreen) {
 
 	_softRenderer = matchingRendererType == Graphics::kRendererTypeTinyGL;
 	if (!_softRenderer) {
-		initGraphics3d(screenW, screenH, fullscreen, true);
+		initGraphics3d(screenW, screenH, fullscreen);
 	} else {
 		initGraphics(screenW, screenH, nullptr);
 	}
diff --git a/engines/myst3/gfx.cpp b/engines/myst3/gfx.cpp
index 621dc46280..3fc35f3764 100644
--- a/engines/myst3/gfx.cpp
+++ b/engines/myst3/gfx.cpp
@@ -205,7 +205,7 @@ Renderer *createRenderer(OSystem *system) {
 	}
 
 	if (isAccelerated) {
-		initGraphics3d(width, height, fullscreen, true);
+		initGraphics3d(width, height, fullscreen);
 	} else {
 		initGraphics(width, height, nullptr);
 	}
diff --git a/engines/stark/gfx/driver.cpp b/engines/stark/gfx/driver.cpp
index 618d6b1e42..789742c27f 100644
--- a/engines/stark/gfx/driver.cpp
+++ b/engines/stark/gfx/driver.cpp
@@ -38,7 +38,7 @@ namespace Gfx {
 Driver *Driver::create() {
 #if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
 	bool fullscreen = ConfMan.getBool("fullscreen");
-	initGraphics3d(kOriginalWidth, kOriginalHeight, fullscreen, true);
+	initGraphics3d(kOriginalWidth, kOriginalHeight, fullscreen);
 
 	if (OpenGLContext.shadersSupported) {
 		return new OpenGLSDriver();
diff --git a/engines/util.h b/engines/util.h
index ffa992c02c..b144762d32 100644
--- a/engines/util.h
+++ b/engines/util.h
@@ -60,6 +60,6 @@ void initGraphicsModes(const Graphics::ModeList &modes);
 void initGraphics(int width, int height);
 void initGraphics(int width, int height, const Graphics::PixelFormat *format);
 void initGraphics(int width, int height, const Common::List<Graphics::PixelFormat> &formatList);
-void initGraphics3d(int width, int height, bool fullscreen, bool accel3d);
+void initGraphics3d(int width, int height, bool fullscreen);
 
 #endif
diff --git a/engines/wintermute/base/base_game.cpp b/engines/wintermute/base/base_game.cpp
index ae6550e9ec..b97f59f339 100644
--- a/engines/wintermute/base/base_game.cpp
+++ b/engines/wintermute/base/base_game.cpp
@@ -500,7 +500,7 @@ bool BaseGame::initialize1() {
 bool BaseGame::initialize2() { // we know whether we are going to be accelerated
 #ifdef ENABLE_WME3D
 	bool fullscreen = ConfMan.getBool("fullscreen");
-	initGraphics3d(_settings->getResWidth(), _settings->getResHeight(), fullscreen, true);
+	initGraphics3d(_settings->getResWidth(), _settings->getResHeight(), fullscreen);
 
 	Common::String rendererConfig = ConfMan.get("renderer");
 	Graphics::RendererType desiredRendererType = Graphics::parseRendererTypeCode(rendererConfig);
diff --git a/engines/wintermute/wintermute.cpp b/engines/wintermute/wintermute.cpp
index 0e7c2cf455..ad20d549e4 100644
--- a/engines/wintermute/wintermute.cpp
+++ b/engines/wintermute/wintermute.cpp
@@ -129,7 +129,7 @@ Common::Error WintermuteEngine::run() {
 		return Common::kUnsupportedColorMode;
 	}
 #else
-	initGraphics3d(800, 600, ConfMan.getBool("fullscreen"), true);
+	initGraphics3d(800, 600, ConfMan.getBool("fullscreen"));
 #endif
 
 	// Create debugger console. It requires GFX to be initialized