Skip to content

Commit 99039bf

Browse files
codeanticodecodeanticode
committed
simpler fbo layer code
1 parent 9d819b8 commit 99039bf

File tree

4 files changed

+67
-64
lines changed

4 files changed

+67
-64
lines changed

‎core/src/processing/opengl/PGL.java

+42-36
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,6 @@ public abstract class PGL {
6969

7070
// Parameters
7171

72-
protected static boolean USE_FBOLAYER_BY_DEFAULT = false;
7372
public static int REQUESTED_DEPTH_BITS = 24;
7473
public static int REQUESTED_STENCIL_BITS = 8;
7574
public static int REQUESTED_ALPHA_BITS = 8;
@@ -128,16 +127,17 @@ public abstract class PGL {
128127
* order to make sure the lines are always on top of the fill geometry */
129128
protected static float STROKE_DISPLACEMENT = 0.999f;
130129

130+
protected static boolean DOUBLE_BUFFERED = true;
131131

132132
// ........................................................
133133

134134
// FBO layer
135135

136-
protected boolean requestedFBOLayer = false;
137-
protected boolean requestedFBOLayerReset = false;
136+
protected boolean fboLayerEnabled = false;
138137
protected boolean fboLayerCreated = false;
139-
protected boolean fboLayerInUse = false;
140-
protected boolean firstFrame = true;
138+
protected boolean fboLayerEnabledReq = false;
139+
protected boolean fboLayerDisableReq = false;
140+
protected boolean fbolayerResetReq = false;
141141
public int reqNumSamples;
142142
protected int numSamples;
143143

@@ -442,10 +442,6 @@ public PGL(PGraphicsOpenGL pg) {
442442
glMultiDepthStencil = allocateIntBuffer(1);
443443
glMultiDepth = allocateIntBuffer(1);
444444
glMultiStencil = allocateIntBuffer(1);
445-
446-
fboLayerCreated = false;
447-
fboLayerInUse = false;
448-
firstFrame = false;
449445
}
450446

451447
byteBuffer = allocateByteBuffer(1);
@@ -494,39 +490,44 @@ static public int smoothToSamples(int smooth) {
494490

495491

496492
protected int getReadFramebuffer() {
497-
return fboLayerInUse ? glColorFbo.get(0) : 0;
493+
return fboLayerEnabled ? glColorFbo.get(0) : 0;
498494
}
499495

500496

501497
protected int getDrawFramebuffer() {
502-
if (fboLayerInUse) return 1 < numSamples ? glMultiFbo.get(0) :
503-
glColorFbo.get(0);
498+
if (fboLayerEnabled) return 1 < numSamples ? glMultiFbo.get(0) :
499+
glColorFbo.get(0);
504500
else return 0;
505501
}
506502

507503

508504
protected int getDefaultDrawBuffer() {
509-
return fboLayerInUse ? COLOR_ATTACHMENT0 : BACK;
505+
return fboLayerEnabled ? COLOR_ATTACHMENT0 : BACK;
510506
}
511507

512508

513509
protected int getDefaultReadBuffer() {
514-
return fboLayerInUse ? COLOR_ATTACHMENT0 : FRONT;
510+
return fboLayerEnabled ? COLOR_ATTACHMENT0 : FRONT;
515511
}
516512

517513

518514
protected boolean isFBOBacked() {;
519-
return fboLayerInUse;
515+
return fboLayerEnabled;
516+
}
517+
518+
519+
public void enableFBOLayer() {
520+
fboLayerEnabledReq = true;
520521
}
521522

522523

523-
public void requestFBOLayer() {
524-
requestedFBOLayer = true;
524+
public void disableFBOLayer() {
525+
fboLayerDisableReq = true;
525526
}
526527

527528

528-
public void requestFBOLayerReset() {
529-
requestedFBOLayerReset = true;
529+
public void resetFBOLayer() {
530+
fbolayerResetReq = true;
530531
}
531532

532533

@@ -639,7 +640,7 @@ public void initPresentMode(float x, float y) {
639640
presentMode = true;
640641
presentX = x;
641642
presentY = y;
642-
requestFBOLayer();
643+
enableFBOLayer();
643644
}
644645

645646

@@ -693,12 +694,17 @@ protected void beginRender() {
693694
pclearColor = clearColor;
694695
clearColor = false;
695696

696-
if (requestedFBOLayer) {
697-
if (requestedFBOLayerReset) {
697+
if (fboLayerEnabledReq) {
698+
fboLayerEnabled = true;
699+
fboLayerEnabledReq = false;
700+
}
701+
702+
if (fboLayerEnabled) {
703+
if (fbolayerResetReq) {
698704
destroyFBOLayer();
699-
requestedFBOLayerReset = false;
705+
fbolayerResetReq = false;
700706
}
701-
if (!fboLayerCreated) {
707+
if (!fboLayerCreated && DOUBLE_BUFFERED) {
702708
createFBOLayer();
703709
}
704710

@@ -711,7 +717,7 @@ protected void beginRender() {
711717
bindFramebufferImpl(FRAMEBUFFER, glMultiFbo.get(0));
712718
}
713719

714-
if (firstFrame) {
720+
if (sketch.frameCount == 0) {
715721
// No need to draw back color buffer because we are in the first frame.
716722
int argb = graphics.backgroundColor;
717723
float a = ((argb >> 24) & 0xff) / 255.0f;
@@ -735,18 +741,12 @@ protected void beginRender() {
735741
0, 0, (int)(scale * graphics.width), (int)(scale * graphics.height),
736742
0, 0, graphics.width, graphics.height);
737743
}
738-
739-
fboLayerInUse = true;
740-
} else {
741-
fboLayerInUse = false;
742744
}
743-
744-
firstFrame = false;
745745
}
746746

747747

748748
protected void endRender(int windowColor) {
749-
if (fboLayerInUse) {
749+
if (fboLayerEnabled) {
750750
syncBackTexture();
751751

752752
// Draw the contents of the back texture to the screen framebuffer.
@@ -804,8 +804,17 @@ protected void endRender(int windowColor) {
804804
int temp = frontTex;
805805
frontTex = backTex;
806806
backTex = temp;
807+
808+
if (fboLayerDisableReq) {
809+
fboLayerEnabled = false;
810+
fboLayerDisableReq = false;
811+
}
807812
} else if (!clearColor && 0 < sketch.frameCount || !sketch.isLooping()) {
808-
requestFBOLayer();
813+
enableFBOLayer();
814+
}
815+
816+
if (fboLayerEnabledReq && !fboLayerCreated && !DOUBLE_BUFFERED) {
817+
createFBOLayer();
809818
}
810819
}
811820

@@ -944,10 +953,7 @@ protected void destroyFBOLayer() {
944953
deleteRenderbuffers(1, glMultiDepth);
945954
deleteRenderbuffers(1, glMultiStencil);
946955
}
947-
948956
fboLayerCreated = false;
949-
fboLayerInUse = false;
950-
// firstFrame = false;
951957
}
952958

953959

‎core/src/processing/opengl/PGLES.java

+21-24
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,8 @@ public class PGLES extends PGL {
7979
// GLES
8080

8181
static {
82+
DOUBLE_BUFFERED = false;
83+
8284
MIN_DIRECT_BUFFER_SIZE = 1;
8385
INDEX_TYPE = GLES20.GL_UNSIGNED_SHORT;
8486

@@ -134,13 +136,7 @@ protected void setFrameRate(float fps) { }
134136
protected void initSurface(int antialias) {
135137
glview = (GLSurfaceView)sketch.getSurfaceView();
136138
reqNumSamples = qualityToSamples(antialias);
137-
138139
registerListeners();
139-
140-
fboLayerCreated = false;
141-
fboLayerInUse = false;
142-
firstFrame = true;
143-
setFps = false;
144140
}
145141

146142

@@ -170,13 +166,13 @@ protected int getStencilBits() {
170166

171167
@Override
172168
protected int getDefaultDrawBuffer() {
173-
return fboLayerInUse ? COLOR_ATTACHMENT0 : FRONT;
169+
return fboLayerEnabled ? COLOR_ATTACHMENT0 : FRONT;
174170
}
175171

176172

177173
@Override
178174
protected int getDefaultReadBuffer() {
179-
return fboLayerInUse ? COLOR_ATTACHMENT0 : FRONT;
175+
return fboLayerEnabled ? COLOR_ATTACHMENT0 : FRONT;
180176
}
181177

182178

@@ -233,26 +229,27 @@ protected void initFBOLayer() {
233229
IntBuffer buf = null;
234230
buf = allocateDirectIntBuffer(fboWidth * fboHeight);
235231

236-
// Copy the contents of the front and back screen buffers to the textures
237-
// of the FBO, so they are properly initialized. Note that the front buffer
238-
// of the default framebuffer (the screen) contains the previous frame:
239-
// https://www.opengl.org/wiki/Default_Framebuffer
240-
// so it is copied to the front texture of the FBO layer:
241-
if (pclearColor || 0 < pgeomCount || !sketch.isLooping()) {
242-
readBuffer(FRONT);
243-
} else {
244-
// ...except when the previous frame has not been cleared and nothing was
245-
// renderered while looping. In this case the back buffer, which holds the
246-
// initial state of the previous frame, still contains the most up-to-date
247-
// screen state.
248-
readBuffer(BACK);
249-
}
232+
// // Copy the contents of the front and back screen buffers to the textures
233+
// // of the FBO, so they are properly initialized. Note that the front buffer
234+
// // of the default framebuffer (the screen) contains the previous frame:
235+
// // https://www.opengl.org/wiki/Default_Framebuffer
236+
// // so it is copied to the front texture of the FBO layer:
237+
// if (pclearColor || 0 < pgeomCount || !sketch.isLooping()) {
238+
// readBuffer(FRONT);
239+
// } else {
240+
// // ...except when the previous frame has not been cleared and nothing was
241+
// // renderered while looping. In this case the back buffer, which holds the
242+
// // initial state of the previous frame, still contains the most up-to-date
243+
// // screen state.
244+
// readBuffer(BACK);
245+
// }
246+
readBuffer(FRONT);
250247
readPixelsImpl(0, 0, fboWidth, fboHeight, RGBA, UNSIGNED_BYTE, buf);
251248
bindTexture(TEXTURE_2D, glColorTex.get(frontTex));
252249
texSubImage2D(TEXTURE_2D, 0, 0, 0, fboWidth, fboHeight, RGBA, UNSIGNED_BYTE, buf);
253250

254-
readBuffer(BACK);
255-
readPixelsImpl(0, 0, fboWidth, fboHeight, RGBA, UNSIGNED_BYTE, buf);
251+
// readBuffer(BACK);
252+
// readPixelsImpl(0, 0, fboWidth, fboHeight, RGBA, UNSIGNED_BYTE, buf);
256253
bindTexture(TEXTURE_2D, glColorTex.get(backTex));
257254
texSubImage2D(TEXTURE_2D, 0, 0, 0, fboWidth, fboHeight, RGBA, UNSIGNED_BYTE, buf);
258255

‎core/src/processing/opengl/PGraphicsOpenGL.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -704,7 +704,7 @@ public void requestDraw() {
704704
}
705705

706706

707-
/*
707+
/*
708708
@Override
709709
// Java only
710710
public PSurface createSurface() { // ignore
@@ -5766,7 +5766,7 @@ public void filter(PShader shader) {
57665766

57675767
boolean needEndDraw = false;
57685768
if (primaryGraphics) {
5769-
pgl.requestFBOLayer();
5769+
pgl.enableFBOLayer();
57705770
} else if (!drawing) {
57715771
beginDraw();
57725772
needEndDraw = true;
@@ -5842,7 +5842,7 @@ public void filter(PShader shader) {
58425842
@Override
58435843
public void copy(int sx, int sy, int sw, int sh,
58445844
int dx, int dy, int dw, int dh) {
5845-
if (primaryGraphics) pgl.requestFBOLayer();
5845+
if (primaryGraphics) pgl.enableFBOLayer();
58465846
loadTexture();
58475847
if (filterTexture == null || filterTexture.contextIsOutdated()) {
58485848
filterTexture = new Texture(this, texture.width, texture.height,

‎core/src/processing/opengl/PShader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -1320,7 +1320,7 @@ protected void unbindTyped() {
13201320
if (-1 < normalLoc) pgl.disableVertexAttribArray(normalLoc);
13211321

13221322
if (-1 < ppixelsLoc) {
1323-
pgl.requestFBOLayer();
1323+
pgl.enableFBOLayer();
13241324
pgl.activeTexture(PGL.TEXTURE0 + ppixelsUnit);
13251325
currentPG.unbindFrontTexture();
13261326
pgl.activeTexture(PGL.TEXTURE0);

0 commit comments

Comments
 (0)