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

[aquadran]

This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
2b5d75f830 STARK: Allow using the OpenGL 1.x renderer when shaders are unavailable
bb16fae4b4 STARK: Provide a more descriptive error when TinyGL is selected


Commit: 2b5d75f83054ed460645a7b8913cf1ce5a0fea9d
    https://github.com/scummvm/scummvm/commit/2b5d75f83054ed460645a7b8913cf1ce5a0fea9d
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-07-08T15:00:41+02:00

Commit Message:
STARK: Allow using the OpenGL 1.x renderer when shaders are unavailable

Changed paths:
    engines/stark/gfx/driver.cpp


diff --git a/engines/stark/gfx/driver.cpp b/engines/stark/gfx/driver.cpp
index 5c1f0ba00f..ce1a65baf9 100644
--- a/engines/stark/gfx/driver.cpp
+++ b/engines/stark/gfx/driver.cpp
@@ -52,6 +52,7 @@ Driver *Driver::create() {
 #if defined(USE_OPENGL_GAME) || defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
 	}
 	bool backendCapableOpenGL = g_system->hasFeature(OSystem::kFeatureOpenGLForGame);
+	bool backendCapableOpenGLShaders = backendCapableOpenGL && OpenGLContext.shadersSupported;
 #endif
 
 	if (matchingRendererType != desiredRendererType && desiredRendererType != Graphics::kRendererTypeDefault) {
@@ -60,14 +61,9 @@ Driver *Driver::create() {
 	}
 
 	Driver *driver = nullptr;
-#if defined(USE_OPENGL_SHADERS) || defined(USE_GLES2)
-	if (!OpenGLContext.shadersSupported) {
-		error("Your system does not have the required OpenGL capabilities");
-	}
-#endif
 
 #if defined(USE_GLES2) || defined(USE_OPENGL_SHADERS)
-	if (backendCapableOpenGL && matchingRendererType == Graphics::kRendererTypeOpenGLShaders) {
+	if (backendCapableOpenGLShaders && matchingRendererType == Graphics::kRendererTypeOpenGLShaders) {
 		driver = new OpenGLSDriver();
 	}
 #endif


Commit: bb16fae4b4948ba15fa7eeb18beb709e4f301be0
    https://github.com/scummvm/scummvm/commit/bb16fae4b4948ba15fa7eeb18beb709e4f301be0
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-07-08T15:00:41+02:00

Commit Message:
STARK: Provide a more descriptive error when TinyGL is selected

Changed paths:
    engines/stark/gfx/driver.cpp


diff --git a/engines/stark/gfx/driver.cpp b/engines/stark/gfx/driver.cpp
index ce1a65baf9..a577d5aa48 100644
--- a/engines/stark/gfx/driver.cpp
+++ b/engines/stark/gfx/driver.cpp
@@ -74,6 +74,7 @@ Driver *Driver::create() {
 #endif
 	if (matchingRendererType == Graphics::kRendererTypeTinyGL) {
 		//driver = CreateTinyGLDriver();
+		error("This game does not currently support software rendering");
 	}
 
 	if (driver)