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

lephilousophe noreply at scummvm.org
Mon Nov 9 13:08:43 UTC 2026


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:
2ca7f12ebc Revert "COLONY: disable xor mode when pausing"
e9c3c1b4f5 BACKENDS: OPENGL: Disable logic operations when rendering 2D


Commit: 2ca7f12ebc0e3b1aff48a139d467c1d44fb94311
    https://github.com/scummvm/scummvm/commit/2ca7f12ebc0e3b1aff48a139d467c1d44fb94311
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-11-09T13:28:15+01:00

Commit Message:
Revert "COLONY: disable xor mode when pausing"

This reverts commit 8abdef4a414c515348e94b09e60959574c57d9da.

Changed paths:
    engines/colony/colony.cpp
    engines/colony/renderer.h
    engines/colony/renderer_opengl.cpp


diff --git a/engines/colony/colony.cpp b/engines/colony/colony.cpp
index 44ed86f3e8d..b9ade441648 100644
--- a/engines/colony/colony.cpp
+++ b/engines/colony/colony.cpp
@@ -350,9 +350,6 @@ bool ColonyEngine::updateScreenSize() {
 }
 
 void ColonyEngine::pauseEngineIntern(bool pause) {
-	if (_gfx)
-		_gfx->pause(pause);
-
 	if (pause && _gfx && _level >= 1 && _level <= 7) {
 		if (_savedScreen) {
 			_savedScreen->free();
diff --git a/engines/colony/renderer.h b/engines/colony/renderer.h
index 0aabee1c545..86073313501 100644
--- a/engines/colony/renderer.h
+++ b/engines/colony/renderer.h
@@ -68,7 +68,6 @@ public:
 
 	// Buffer management
 	virtual void copyToScreen() = 0;
-	virtual void pause(bool pause) {}
 	virtual void setWireframe(bool enable, int64_t fillColor = -1) = 0;
 	virtual void setXorMode(bool enable) {}
 	virtual void setStippleData(const byte *data) {}
diff --git a/engines/colony/renderer_opengl.cpp b/engines/colony/renderer_opengl.cpp
index 2ac965a448c..af782578d97 100644
--- a/engines/colony/renderer_opengl.cpp
+++ b/engines/colony/renderer_opengl.cpp
@@ -75,15 +75,6 @@ public:
 			glDisable(GL_COLOR_LOGIC_OP);
 		}
 	}
-	void pause(bool pause) override {
-		// ScummVM dialogs share the GL context, but must not use XOR drawing.
-		if (pause) {
-			_savedXorMode = glIsEnabled(GL_COLOR_LOGIC_OP);
-			setXorMode(false);
-		} else {
-			setXorMode(_savedXorMode);
-		}
-	}
 	void setStippleData(const byte *data) override {
 		_stippleData = data;
 	}
@@ -149,7 +140,6 @@ private:
 	byte _palette[256 * 3] = {};
 	bool _wireframe = true;
 	int64_t _wireframeFillColor = 0; // -1 = no fill (outline only)
-	bool _savedXorMode = false;
 	const byte *_stippleData = nullptr; // GL_POLYGON_STIPPLE pattern (128 bytes), null = disabled
 	uint32 _stippleFgColor = 0;
 	uint32 _stippleBgColor = 0;


Commit: e9c3c1b4f54a29db1cf41d9707342d8124d06a59
    https://github.com/scummvm/scummvm/commit/e9c3c1b4f54a29db1cf41d9707342d8124d06a59
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2026-11-09T14:07:27+01:00

Commit Message:
BACKENDS: OPENGL: Disable logic operations when rendering 2D

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


diff --git a/backends/graphics/opengl/pipelines/fixed.cpp b/backends/graphics/opengl/pipelines/fixed.cpp
index e569d135d7e..b3cec05b7ed 100644
--- a/backends/graphics/opengl/pipelines/fixed.cpp
+++ b/backends/graphics/opengl/pipelines/fixed.cpp
@@ -32,6 +32,8 @@ void FixedPipeline::activateInternal() {
 	GL_CALL(glDisable(GL_CULL_FACE));
 	GL_CALL(glDisable(GL_DEPTH_TEST));
 	GL_CALL(glDisable(GL_DITHER));
+	GL_CALL(glDisable(GL_COLOR_LOGIC_OP));
+	GL_CALL(glDisable(GL_INDEX_LOGIC_OP));
 
 	GL_CALL(glDisable(GL_LIGHTING));
 	GL_CALL(glDisable(GL_FOG));
diff --git a/backends/graphics/opengl/pipelines/shader.cpp b/backends/graphics/opengl/pipelines/shader.cpp
index b1ede3a8a11..c0d105cd1c9 100644
--- a/backends/graphics/opengl/pipelines/shader.cpp
+++ b/backends/graphics/opengl/pipelines/shader.cpp
@@ -57,6 +57,13 @@ void ShaderPipeline::activateInternal() {
 	GL_CALL(glDisable(GL_DEPTH_TEST));
 	GL_CALL(glDisable(GL_DITHER));
 
+#if !USE_FORCED_GLES2
+	if (OpenGLContext.type == kContextGL) {
+		GL_CALL(glDisable(GL_COLOR_LOGIC_OP));
+		GL_CALL(glDisable(GL_INDEX_LOGIC_OP));
+	}
+#endif
+
 	if (OpenGLContext.multitextureSupported) {
 		GL_CALL(glActiveTexture(GL_TEXTURE0));
 	}




More information about the Scummvm-git-logs mailing list