[Scummvm-git-logs] scummvm master -> 4747708353b7296369dc7c88f10430c1207261b9

[lephilousophe]

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:
1b35e66c01 OPENGL: Dump GLSL version string
4747708353 WINTERMUTE: Fix int vs int32 discrepancy


Commit: 1b35e66c01d1b1b1d83876bccd1f16dd4bb6cc6f
    https://github.com/scummvm/scummvm/commit/1b35e66c01d1b1b1d83876bccd1f16dd4bb6cc6f
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-07-04T08:13:49+02:00

Commit Message:
OPENGL: Dump GLSL version string

This will ease to debug parsing errors

Changed paths:
    graphics/opengl/context.cpp


diff --git a/graphics/opengl/context.cpp b/graphics/opengl/context.cpp
index 17b174900ea..c7f5fb7cd0b 100644
--- a/graphics/opengl/context.cpp
+++ b/graphics/opengl/context.cpp
@@ -257,10 +257,13 @@ void Context::initialize(ContextType contextType) {
 		warning("OpenGL: Unknown context initialized");
 	}
 
+	const char *glslVersionString = (const char *)glGetString(GL_SHADING_LANGUAGE_VERSION);
+
 	// Log features supported by GL context.
 	debug(5, "OpenGL vendor: %s", glGetString(GL_VENDOR));
 	debug(5, "OpenGL renderer: %s", glGetString(GL_RENDERER));
 	debug(5, "OpenGL: version %d.%d", majorVersion, minorVersion);
+	debug(5, "OpenGL: GLSL version string: %s", glslVersionString ? glslVersionString : "<none>");
 	debug(5, "OpenGL: GLSL version: %d", glslVersion);
 	debug(5, "OpenGL: Max texture size: %d", maxTextureSize);
 	debug(5, "OpenGL: NPOT texture support: %d", NPOTSupported);


Commit: 4747708353b7296369dc7c88f10430c1207261b9
    https://github.com/scummvm/scummvm/commit/4747708353b7296369dc7c88f10430c1207261b9
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2022-07-04T08:13:49+02:00

Commit Message:
WINTERMUTE: Fix int vs int32 discrepancy

Changed paths:
    engines/wintermute/ad/ad_game.cpp


diff --git a/engines/wintermute/ad/ad_game.cpp b/engines/wintermute/ad/ad_game.cpp
index 0a637f91025..3767c47af60 100644
--- a/engines/wintermute/ad/ad_game.cpp
+++ b/engines/wintermute/ad/ad_game.cpp
@@ -2505,7 +2505,7 @@ Wintermute::TShadowType AdGame::getMaxShadowType(Wintermute::BaseObject *object)
 //////////////////////////////////////////////////////////////////////////
 bool AdGame::getLayerSize(int *layerWidth, int *layerHeight, Rect32 *viewport, bool *customViewport) {
 	if (_scene && _scene->_mainLayer) {
-		int portX, portY, portWidth, portHeight;
+		int32 portX, portY, portWidth, portHeight;
 		_scene->getViewportOffset(&portX, &portY);
 		_scene->getViewportSize(&portWidth, &portHeight);
 		*customViewport = _sceneViewport || _scene->_viewport;