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

[lephilousophe]

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

Summary:
e2ec3e7aa2 WINTERMUTE: Properly fix post filter


Commit: e2ec3e7aa2fadfac4a680fb8e662f1bdff561424
    https://github.com/scummvm/scummvm/commit/e2ec3e7aa2fadfac4a680fb8e662f1bdff561424
Author: Le Philousophe (lephilousophe at users.noreply.github.com)
Date: 2025-06-09T15:24:56+02:00

Commit Message:
WINTERMUTE: Properly fix post filter

This reverts commit bc34d68db5880bf3501657ff691baf3a63c843e4.
The texture was still bound after the rendering and was messed up at the
next setup3D call.

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 f8e208de482..5c586324d15 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -1020,8 +1020,6 @@ void BaseRenderOpenGL3D::postfilter() {
 		glEnable(GL_TEXTURE_2D);
 		glBindTexture(GL_TEXTURE_2D, _postfilterTexture);
 
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
 
 		glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, _width, _height, 0);
 
@@ -1102,6 +1100,7 @@ void BaseRenderOpenGL3D::postfilter() {
 		}
 
 		glTexEnvi(GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE);
+		glBindTexture(GL_TEXTURE_2D, 0);
 		glDisable(GL_TEXTURE_2D);
 	}
 }
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 ec82e8df035..7d7418ab2bc 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -1110,12 +1110,11 @@ void BaseRenderOpenGL3DShader::postfilter() {
 			_postfilterShader->setUniform1f("sepiaMode", false);
 		}
 
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
 		glCopyTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 0, 0, _width, _height, 0);
 
 		glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);
+
+		glBindTexture(GL_TEXTURE_2D, 0);
 	}
 }