[Scummvm-git-logs] scummvm master -> 095e286d964c0dc0a876cbace89fe941321916a5

[aquadran]

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

Summary:
095e286d96 WINTERMUTE: Fixed overlay GUI show up


Commit: 095e286d964c0dc0a876cbace89fe941321916a5
    https://github.com/scummvm/scummvm/commit/095e286d964c0dc0a876cbace89fe941321916a5
Author: Paweł Kołodziejski (aquadran at gmail.com)
Date: 2024-11-20T17:28:50+01:00

Commit Message:
WINTERMUTE: Fixed overlay GUI show up

Changed paths:
    engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
    engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp


diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
index 7d3deb28f22..86bf7678a3b 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -118,11 +118,14 @@ bool BaseRenderOpenGL3D::initRenderer(int width, int height, bool windowed) {
 bool BaseRenderOpenGL3D::flip() {
 	_lastTexture = nullptr;
 	postfilter();
-	// Disable blend mode to prevent interfere with backend renderer
-	bool prevStateBlend = glIsEnabled(GL_BLEND);
+
+	// Disable blend mode and cull face to prevent interfere with backend renderer
 	glDisable(GL_BLEND);
+	glDisable(GL_CULL_FACE);
+
 	g_system->updateScreen();
-	prevStateBlend ? glEnable(GL_BLEND) : glDisable(GL_BLEND);
+
+	_state = RSTATE_NONE;
 	return true;
 }
 
@@ -1023,7 +1026,6 @@ void BaseRenderOpenGL3D::postfilter() {
 		return;
 
 	setup2D();
-	_state = RSTATE_NONE;
 	glViewport(0, 0, _width, _height);
 
 	glMatrixMode(GL_PROJECTION);
diff --git a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
index b1404a48388..cd4c36b36d9 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -139,11 +139,14 @@ bool BaseRenderOpenGL3DShader::initRenderer(int width, int height, bool windowed
 
 bool BaseRenderOpenGL3DShader::flip() {
 	_lastTexture = nullptr;
-	// Disable blend mode to prevent interfere with backend renderer
-	bool prevStateBlend = glIsEnabled(GL_BLEND);
+
+	// Disable blend mode and cull face to prevent interfere with backend renderer
 	glDisable(GL_BLEND);
+	glDisable(GL_CULL_FACE);
+	
 	g_system->updateScreen();
-	prevStateBlend ? glEnable(GL_BLEND) : glDisable(GL_BLEND);
+	
+	_state = RSTATE_NONE;
 	return true;
 }