eessppeelllloo/processing4
1
0
Fork 0
mirror of https://github.com/processing/processing4.git synced 2026-02-03 21:59:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

keep current user-provided FBO

Browse Source
This commit is contained in:
codeanticode
2016-08-30 02:20:24 -04:00
parent 4dbf84c2dc
commit decf462b1b
1 changed files with 37 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

65
core/src/processing/opengl/PGraphicsOpenGL.java
View File

@@ -1667,42 +1667,51 @@ public class PGraphicsOpenGL extends PGraphics {
protected void beginPixelsOp(int op) {
FrameBuffer pixfb = null;
FrameBuffer currfb = getCurrentFB();
if (primaryGraphics) {
if (op == OP_READ) {
if (pgl.isFBOBacked() && pgl.isMultisampled()) {
// Making sure the back texture is up-to-date...
pgl.syncBackTexture();
// ...because the read framebuffer uses it as the color buffer (the
// draw framebuffer is MSAA so it cannot be read from it).
pixfb = readFramebuffer;
} else {
pixfb = drawFramebuffer;
FrameBuffer rfb = readFramebuffer;
FrameBuffer dfb = drawFramebuffer;
if ((currfb == rfb) || (currfb == dfb)) {
// Not user-provided FB, need to check if the correct FB is current.
if (op == OP_READ) {
if (pgl.isFBOBacked() && pgl.isMultisampled()) {
// Making sure the back texture is up-to-date...
pgl.syncBackTexture();
// ...because the read framebuffer uses it as the color buffer (the
// draw framebuffer is MSAA so it cannot be read from it).
pixfb = rfb;
} else {
pixfb = dfb;
}
} else if (op == OP_WRITE) {
// We can write to the draw framebuffer irrespective of whether is
// FBO-baked or multisampled.
pixfb = dfb;
}
} else if (op == OP_WRITE) {
// We can write to the draw framebuffer irrespective of whether is
// FBO-baked or multisampled.
pixfb = drawFramebuffer;
}
} else {
FrameBuffer ofb = offscreenFramebuffer;
FrameBuffer mfb = multisampleFramebuffer;
if (op == OP_READ) {
if (offscreenMultisample) {
// Making sure the offscreen FBO is up-to-date
int mask = PGL.COLOR_BUFFER_BIT;
if (hints[ENABLE_BUFFER_READING]) {
mask |= PGL.DEPTH_BUFFER_BIT | PGL.STENCIL_BUFFER_BIT;
}
if (ofb != null && mfb != null) {
mfb.copy(ofb, mask);
if ((currfb == ofb) || (currfb == mfb)) {
// Not user-provided FB, need to check if the correct FB is current.
if (op == OP_READ) {
if (offscreenMultisample) {
// Making sure the offscreen FBO is up-to-date
int mask = PGL.COLOR_BUFFER_BIT;
if (hints[ENABLE_BUFFER_READING]) {
mask |= PGL.DEPTH_BUFFER_BIT | PGL.STENCIL_BUFFER_BIT;
}
if (ofb != null && mfb != null) {
mfb.copy(ofb, mask);
}
}
// We always read the screen pixels from the color FBO.
pixfb = ofb;
} else if (op == OP_WRITE) {
// We can write directly to the color FBO, or to the multisample FBO
// if multisampling is enabled.
pixfb = offscreenMultisample ? mfb : ofb;
}
// We always read the screen pixels from the color FBO.
pixfb = ofb;
} else if (op == OP_WRITE) {
// We can write directly to the color FBO, or to the multisample FBO
// if multisampling is enabled.
pixfb = offscreenMultisample ? mfb : ofb;
}
}