From a70d76fd9f6469285183fdf4093f7d074f7788ad Mon Sep 17 00:00:00 2001 From: Melody Madeline Lyons Date: Sun, 18 Aug 2024 22:26:57 -0700 Subject: [PATCH] Revert "Fix additive blend func" This reverts commit 7aa07f2ca4c59a147b26bc5a5f562a76639e6010. --- binding/osfm-screen-binding.cpp | 2 +- src/display/gl/glstate.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/binding/osfm-screen-binding.cpp b/binding/osfm-screen-binding.cpp index 86e346cd7..fa61833d7 100644 --- a/binding/osfm-screen-binding.cpp +++ b/binding/osfm-screen-binding.cpp @@ -53,7 +53,7 @@ struct PingPong { } void clearBuffers() { - glState.clearColor.pushSet(Vec4(0, 0, 0, 0)); + glState.clearColor.pushSet(Vec4(0, 0, 0, 1)); for (int i = 0; i < 2; ++i) { FBO::bind(rt[i].fbo); diff --git a/src/display/gl/glstate.cpp b/src/display/gl/glstate.cpp index ac279c3e2..cfafe344f 100644 --- a/src/display/gl/glstate.cpp +++ b/src/display/gl/glstate.cpp @@ -85,7 +85,7 @@ void GLBlendMode::apply(const BlendType &value) { case BlendAddition: gl.BlendEquation(GL_FUNC_ADD); - gl.BlendFuncSeparate(GL_ONE, GL_ONE, GL_ZERO, GL_ONE); + gl.BlendFuncSeparate(GL_SRC_ALPHA, GL_ONE, GL_ONE, GL_ONE); break; case BlendSubstraction: