[Scummvm-git-logs] scummvm master -> 424d76f0e7c98dba301a0301cf5f66d5c61a55ca

[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:
35e12e2491 OPENGL: Lower the minimum GLSL version to 1.10
424d76f0e7 OPENGL: Log more information about the GL context


Commit: 35e12e2491d199a1ea8f54979fbbf7c065e059f6
    https://github.com/scummvm/scummvm/commit/35e12e2491d199a1ea8f54979fbbf7c065e059f6
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-12-05T21:53:07+01:00

Commit Message:
OPENGL: Lower the minimum GLSL version to 1.10

Changed paths:
    backends/graphics/opengl/shader.cpp


diff --git a/backends/graphics/opengl/shader.cpp b/backends/graphics/opengl/shader.cpp
index 1f3586dc87..012314f8b5 100644
--- a/backends/graphics/opengl/shader.cpp
+++ b/backends/graphics/opengl/shader.cpp
@@ -253,7 +253,7 @@ bool Shader::setUniform(const Common::String &name, ShaderUniformValue *value) {
 }
 
 GLshader Shader::compileShader(const char *source, GLenum shaderType) {
-	const GLchar *versionSource = g_context.type == kContextGLES2 ? "#version 100\n" : "#version 120\n";
+	const GLchar *versionSource = g_context.type == kContextGLES2 ? "#version 100\n" : "#version 110\n";
 	GLshader handle;
 	GL_ASSIGN(handle, glCreateShader(shaderType));
 	if (!handle) {


Commit: 424d76f0e7c98dba301a0301cf5f66d5c61a55ca
    https://github.com/scummvm/scummvm/commit/424d76f0e7c98dba301a0301cf5f66d5c61a55ca
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2021-12-05T21:53:07+01:00

Commit Message:
OPENGL: Log more information about the GL context

Changed paths:
    backends/graphics/opengl/context.cpp
    backends/graphics/opengl/opengl-defs.h


diff --git a/backends/graphics/opengl/context.cpp b/backends/graphics/opengl/context.cpp
index 7b4c6c1c2f..6a730030b1 100644
--- a/backends/graphics/opengl/context.cpp
+++ b/backends/graphics/opengl/context.cpp
@@ -207,6 +207,10 @@ void OpenGLGraphicsManager::initializeGLContext() {
 	}
 
 	// Log features supported by GL context.
+	if (g_context.shadersSupported)
+		debug(5, "GLSL version: %s", g_context.glGetString(GL_SHADING_LANGUAGE_VERSION));
+	debug(5, "OpenGL vendor: %s", g_context.glGetString(GL_VENDOR));
+	debug(5, "OpenGL renderer: %s", g_context.glGetString(GL_RENDERER));
 	debug(5, "OpenGL: NPOT texture support: %d", g_context.NPOTSupported);
 	debug(5, "OpenGL: Shader support: %d", g_context.shadersSupported);
 	debug(5, "OpenGL: Multitexture support: %d", g_context.multitextureSupported);
diff --git a/backends/graphics/opengl/opengl-defs.h b/backends/graphics/opengl/opengl-defs.h
index 0bf83fed1e..dcbec6ae4b 100644
--- a/backends/graphics/opengl/opengl-defs.h
+++ b/backends/graphics/opengl/opengl-defs.h
@@ -101,6 +101,7 @@ typedef GLhandleARB GLshader;
 #define GL_RENDERER                       0x1F01
 #define GL_VERSION                        0x1F02
 #define GL_EXTENSIONS                     0x1F03
+#define GL_SHADING_LANGUAGE_VERSION       0x8B8C
 
 /* ErrorCode */
 #define GL_NO_ERROR                       0