mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-09 23:34:20 +00:00
Code Activity

OpenGL: Correctly restore blend mode when nested context goes out-of-scope

Browse source 
Fixes an issue where primitives such as text could end up with sharp
edges when creating temporary contexts:

    void paint (Graphics& g)
    {
        g.fillAll (Colours::white);
        const auto preferredType = g.getInternalContext().getPreferredImageTypeForTemporaryImages();
        Image img (Image::ARGB, getWidth(), getHeight(), false, *preferredType);
        {
            Graphics g2 (img);
        }
        g.setColour (Colours::black);
        g.setFont (32);
        g.drawText ("test", getLocalBounds(), Justification::centred);
    }
This commit is contained in:
reuk 2025-11-13 17:28:15 +00:00
parent 2efd3e0661
commit a3f81eb2fb
No known key found for this signature in database
1 changed files with 28 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

30
modules/juce_opengl/opengl/juce_OpenGLGraphicsContext.cpp
View file

@ -978,6 +978,20 @@ struct StateHelpers
{ {
BlendingMode() noexcept {} BlendingMode() noexcept {}
~BlendingMode()
{
glBlendFuncSeparate (prevSrcRGB, prevDstRGB, prevSrcAlpha, prevDstAlpha);
if ((bool) glIsEnabled (GL_BLEND) == prevBlendEnabled)
return;
if (prevBlendEnabled)
glEnable (GL_BLEND);
else
glDisable (GL_BLEND);
}
void resync() noexcept void resync() noexcept
{ {
glDisable (GL_BLEND); glDisable (GL_BLEND);
@ -1030,8 +1044,20 @@ struct StateHelpers
} }
private: private:
bool blendingEnabled = false; static GLenum getBlendEnum (GLenum kind)
{
GLint result{};
glGetIntegerv (kind, &result);
return static_cast<GLenum> (result);
}
GLenum srcFunction = 0, dstFunction = 0; GLenum srcFunction = 0, dstFunction = 0;
GLenum prevSrcAlpha = getBlendEnum (GL_BLEND_SRC_ALPHA);
GLenum prevSrcRGB = getBlendEnum (GL_BLEND_SRC_RGB);
GLenum prevDstAlpha = getBlendEnum (GL_BLEND_DST_ALPHA);
GLenum prevDstRGB = getBlendEnum (GL_BLEND_DST_RGB);
bool blendingEnabled = false;
bool prevBlendEnabled = glIsEnabled (GL_BLEND);
}; };
//============================================================================== //==============================================================================
@ -1786,7 +1812,7 @@ private:
//============================================================================== //==============================================================================
struct SavedState final : public RenderingHelpers::SavedStateBase<SavedState> struct SavedState final : public RenderingHelpers::SavedStateBase<SavedState>
{ {
using BaseClass = RenderingHelpers::SavedStateBase<SavedState>; using BaseClass = SavedStateBase;
SavedState (GLState* s) : BaseClass (s->target.bounds), state (s) SavedState (GLState* s) : BaseClass (s->target.bounds), state (s)
{} {}