[Scummvm-git-logs] scummvm master -> a03a3b69ef11ae44cfba38b798157c4bb56bb8a8
aquadran
noreply at scummvm.org
Sun May 25 06:09:43 UTC 2025
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:
a03a3b69ef WINTERMUTE: Enabling blending for 3d mode is needed after all
Commit: a03a3b69ef11ae44cfba38b798157c4bb56bb8a8
https://github.com/scummvm/scummvm/commit/a03a3b69ef11ae44cfba38b798157c4bb56bb8a8
Author: PaweÅ KoÅodziejski (aquadran at gmail.com)
Date: 2025-05-25T08:09:39+02:00
Commit Message:
WINTERMUTE: Enabling blending for 3d mode is needed after all
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 fdd2a8f2812..5e29ea51552 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d.cpp
@@ -180,11 +180,6 @@ bool BaseRenderOpenGL3D::setup3D(Camera3D *camera, bool force) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
- // Disable blending for 3d rendering, it seems no need to enable it.
- // It will be enabled in other places when needed.
- // This is delta compared to original sources.
- glDisable(GL_BLEND);
-
glEnable(GL_DEPTH_TEST);
glEnable(GL_LIGHTING);
glEnable(GL_ALPHA_TEST);
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 cf02d430a46..6bf4fbbf487 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -260,11 +260,6 @@ bool BaseRenderOpenGL3DShader::setup3D(Camera3D *camera, bool force) {
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR_MIPMAP_LINEAR);
- // Disable blending for 3d rendering, it seems no need to enable it.
- // It will be enabled in other places when needed.
- // This is delta compared to original sources.
- glDisable(GL_BLEND);
-
glEnable(GL_DEPTH_TEST);
// WME uses 8 as a reference value and Direct3D expects it to be in the range [0, 255]
_alphaRef = 8 / 255.0f;
More information about the Scummvm-git-logs
mailing list