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

OpenGLFrameBuffer: Fix writePixels implementation, which previously blended instead of replacing existing pixels

Browse source
This commit is contained in:
reuk 2025-01-14 19:09:16 +00:00
parent 5f7d6d70fc
commit 01821b5811
No known key found for this signature in database
3 changed files with 14 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

14
modules/juce_opengl/opengl/juce_OpenGLContext.cpp
View file

@ -1525,14 +1525,22 @@ struct DepthTestDisabler
void OpenGLContext::copyTexture (const Rectangle<int>& targetClipArea,
const Rectangle<int>& anchorPosAndTextureSize,
const int contextWidth, const int contextHeight,
bool flippedVertically)
bool flippedVertically,
bool blend)
{
if (contextWidth <= 0 || contextHeight <= 0)
return;
JUCE_CHECK_OPENGL_ERROR
glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
glEnable (GL_BLEND);
if (blend)
{
glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
glEnable (GL_BLEND);
}
else
{
glDisable (GL_BLEND);
}
DepthTestDisabler depthDisabler;

4
modules/juce_opengl/opengl/juce_OpenGLContext.h
View file

@ -332,8 +332,8 @@ public:
void copyTexture (const Rectangle<int>& targetClipArea,
const Rectangle<int>& anchorPosAndTextureSize,
int contextWidth, int contextHeight,
bool textureOriginIsBottomLeft);
bool textureOriginIsBottomLeft,
bool blend = true);
/** Changes the amount of GPU memory that the internal cache for Images is allowed to use. */
void setImageCacheSize (size_t cacheSizeBytes) noexcept;

2
modules/juce_opengl/opengl/juce_OpenGLFrameBuffer.cpp
View file

@ -356,7 +356,7 @@ bool OpenGLFrameBuffer::writePixels (const PixelARGB* data, const Rectangle<int>
glViewport (0, 0, pimpl->width, pimpl->height);
pimpl->context.copyTexture (area, Rectangle<int> (area.getX(), area.getY(),
tex.getWidth(), tex.getHeight()),
pimpl->width, pimpl->height, true);
pimpl->width, pimpl->height, true, false);
JUCE_CHECK_OPENGL_ERROR
return true;