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

[lephilousophe]

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

Summary:
2dfe736201 BACKENDS: OPENGL: Add missing flags checks.
dd551f3b56 BACKENDS: OPENGL: Fix CID 1611396


Commit: 2dfe7362016ba7a35e8f2da35cbc16d43d79474d
    https://github.com/scummvm/scummvm/commit/2dfe7362016ba7a35e8f2da35cbc16d43d79474d
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-08-23T16:02:51+02:00

Commit Message:
BACKENDS: OPENGL: Add missing flags checks.

Fixes CID 1611397

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


diff --git a/backends/graphics/opengl/opengl-graphics.cpp b/backends/graphics/opengl/opengl-graphics.cpp
index 5ba16165469..d8598898d76 100644
--- a/backends/graphics/opengl/opengl-graphics.cpp
+++ b/backends/graphics/opengl/opengl-graphics.cpp
@@ -551,6 +551,10 @@ OSystem::TransactionError OpenGLGraphicsManager::endGFXTransaction() {
 						transactionError |= OSystem::kTransactionModeSwitchFailed;
 					}
 
+					if (_oldState.flags != _currentState.flags) {
+						transactionError |= OSystem::kTransactionModeSwitchFailed;
+					}
+
 					if (_oldState.filtering != _currentState.filtering) {
 						transactionError |= OSystem::kTransactionFilteringFailed;
 					}
diff --git a/backends/graphics/opengl/opengl-graphics.h b/backends/graphics/opengl/opengl-graphics.h
index dfabc4f05ee..3c1db36f643 100644
--- a/backends/graphics/opengl/opengl-graphics.h
+++ b/backends/graphics/opengl/opengl-graphics.h
@@ -190,8 +190,8 @@ protected:
 #ifdef USE_RGB_COLOR
 		    gameFormat(),
 #endif
-		    aspectRatioCorrection(false), graphicsMode(GFX_OPENGL), filtering(true),
-		    scalerIndex(0), scaleFactor(1), shader() {
+		    aspectRatioCorrection(false), graphicsMode(GFX_OPENGL), flags(0),
+			filtering(true), scalerIndex(0), scaleFactor(1), shader() {
 		}
 
 		bool valid;
@@ -217,7 +217,8 @@ protected:
 #endif
 			    && aspectRatioCorrection == right.aspectRatioCorrection
 			    && graphicsMode == right.graphicsMode
-				&& filtering == right.filtering
+			    && flags == right.flags
+			    && filtering == right.filtering
 			    && shader == right.shader;
 		}
 


Commit: dd551f3b56f58c86034490d6993b7ce5974845cb
    https://github.com/scummvm/scummvm/commit/dd551f3b56f58c86034490d6993b7ce5974845cb
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-08-23T16:08:37+02:00

Commit Message:
BACKENDS: OPENGL: Fix CID 1611396

Changed paths:
    backends/graphics/opengl/renderer3d.h


diff --git a/backends/graphics/opengl/renderer3d.h b/backends/graphics/opengl/renderer3d.h
index 65b8d4334e7..dd19a721926 100644
--- a/backends/graphics/opengl/renderer3d.h
+++ b/backends/graphics/opengl/renderer3d.h
@@ -66,9 +66,9 @@ protected:
 	GLuint _renderBuffers[3];
 	GLuint _frameBuffers[2];
 
-#define CTX_STATE(gl_param) GLboolean _save ## gl_param
-#define CTX_BOOLEAN(gl_param) GLboolean _save ## gl_param
-#define CTX_INTEGER(gl_param, count) GLint _save ## gl_param[count]
+#define CTX_STATE(gl_param) GLboolean _save ## gl_param = false
+#define CTX_BOOLEAN(gl_param) GLboolean _save ## gl_param = false
+#define CTX_INTEGER(gl_param, count) GLint _save ## gl_param[count] = { 0 }
 
 	CTX_STATE(GL_BLEND);
 	CTX_STATE(GL_CULL_FACE);