[Scummvm-git-logs] scummvm master -> 43a1bd8eb0b83cc7e61ba29a66a358392e50b6bf
sev-
noreply at scummvm.org
Thu Jun 19 22:33:58 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:
43a1bd8eb0 ENGINES: Set boolean uniforms using integer calls for AmigaOS 4
Commit: 43a1bd8eb0b83cc7e61ba29a66a358392e50b6bf
https://github.com/scummvm/scummvm/commit/43a1bd8eb0b83cc7e61ba29a66a358392e50b6bf
Author: Cameron Cawley (ccawley2011 at gmail.com)
Date: 2025-06-20T00:33:55+02:00
Commit Message:
ENGINES: Set boolean uniforms using integer calls for AmigaOS 4
Changed paths:
engines/stark/gfx/openglssurface.cpp
engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
diff --git a/engines/stark/gfx/openglssurface.cpp b/engines/stark/gfx/openglssurface.cpp
index fff9615e342..d1a88e5c86a 100644
--- a/engines/stark/gfx/openglssurface.cpp
+++ b/engines/stark/gfx/openglssurface.cpp
@@ -54,7 +54,7 @@ void OpenGLSSurfaceRenderer::render(const Bitmap *bitmap, const Common::Point &d
_shader->use();
_shader->setUniform1f("fadeLevel", _fadeLevel);
- _shader->setUniform1f("snapToGrid", _snapToGrid);
+ _shader->setUniform("snapToGrid", _snapToGrid ? 1 : 0);
_shader->setUniform("verOffsetXY", normalizeOriginalCoordinates(dest.x, dest.y));
if (_noScalingOverride) {
_shader->setUniform("verSizeWH", normalizeCurrentCoordinates(width, height));
@@ -78,7 +78,7 @@ void OpenGLSSurfaceRenderer::fill(const Color &color, const Common::Point &dest,
_shaderFill->use();
_shaderFill->setUniform1f("fadeLevel", _fadeLevel);
- _shaderFill->setUniform1f("snapToGrid", _snapToGrid);
+ _shaderFill->setUniform("snapToGrid", _snapToGrid ? 1 : 0);
_shaderFill->setUniform("verOffsetXY", normalizeOriginalCoordinates(dest.x, dest.y));
if (_noScalingOverride) {
_shaderFill->setUniform("verSizeWH", normalizeCurrentCoordinates(width, height));
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 afd9c746882..2d4860a5fb8 100644
--- a/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
+++ b/engines/wintermute/base/gfx/opengl/base_render_opengl3d_shader.cpp
@@ -1123,9 +1123,9 @@ void BaseRenderOpenGL3DShader::postfilter() {
glUniform1i(_postfilterShader->getUniformLocation("tex"), 0);
if (_postFilterMode == kPostFilterSepia) {
- _postfilterShader->setUniform1f("sepiaMode", true);
+ _postfilterShader->setUniform("sepiaMode", true);
} else {
- _postfilterShader->setUniform1f("sepiaMode", false);
+ _postfilterShader->setUniform("sepiaMode", false);
}
g_system->presentBuffer();
More information about the Scummvm-git-logs
mailing list