move framebuffer blitting after restoring screen fb

codeanticode · codeanticode · commit 8d4a3948330f · 2015-09-07T11:14:47.000-04:00
diff --git a/core/src/processing/opengl/PGL.java b/core/src/processing/opengl/PGL.java
@@ -894,6 +894,8 @@ private void createFBOLayer() {
     clearColor(r, g, b, a);
     clear(DEPTH_BUFFER_BIT | STENCIL_BUFFER_BIT | COLOR_BUFFER_BIT);
 
+    bindFramebufferImpl(FRAMEBUFFER, 0);
+
     if (0 < pg.parent.frameCount) {
       // Copy the contents of the front and back screen buffers to the textures
       // of the FBO, so they are properly initialized.
@@ -914,8 +916,6 @@ private void createFBOLayer() {
                       COLOR_BUFFER_BIT, NEAREST);
     }
 
-    bindFramebufferImpl(FRAMEBUFFER, 0);
-
     fboLayerCreated = true;
   }
 

Original file line number	Diff line number	Diff line change
`@@ -894,6 +894,8 @@ private void createFBOLayer() {`
`894`	`894`	`clearColor(r, g, b, a);`
`895`	`895`	`clear(DEPTH_BUFFER_BIT \| STENCIL_BUFFER_BIT \| COLOR_BUFFER_BIT);`
`896`	`896`
	`897`	`+ bindFramebufferImpl(FRAMEBUFFER, 0);`
	`898`	`+`
`897`	`899`	`if (0 < pg.parent.frameCount) {`
`898`	`900`	`// Copy the contents of the front and back screen buffers to the textures`
`899`	`901`	`// of the FBO, so they are properly initialized.`
`@@ -914,8 +916,6 @@ private void createFBOLayer() {`
`914`	`916`	`COLOR_BUFFER_BIT, NEAREST);`
`915`	`917`	`}`
`916`	`918`
`917`		`- bindFramebufferImpl(FRAMEBUFFER, 0);`
`918`		`-`
`919`	`919`	`fboLayerCreated = true;`
`920`	`920`	`}`
`921`	`921`