added swapColorBuffers() to FrameBuffer, some cleanup

codeanticode · codeanticode · commit 7d437bafa1e9 · 2012-10-31T16:33:35.000Z
diff --git a/core/src/processing/opengl/FrameBuffer.java b/core/src/processing/opengl/FrameBuffer.java
@@ -290,6 +290,27 @@ public void setColorBuffers(Texture[] textures, int n) {
   }
 
 
+  public void swapColorBuffers() {
+    for (int i = 0; i < numColorBuffers - 1; i++) {
+      int i1 = (i + 1);
+      Texture tmp = colorBufferTex[i];
+      colorBufferTex[i] = colorBufferTex[i1];
+      colorBufferTex[i1] = tmp;
+    }
+
+    pg.pushFramebuffer();
+    pg.setFramebuffer(this);
+    for (int i = 0; i < numColorBuffers; i++) {
+      pgl.framebufferTexture2D(PGL.FRAMEBUFFER, PGL.COLOR_ATTACHMENT0 + i,
+                               colorBufferTex[i].glTarget,
+                               colorBufferTex[i].glName, 0);
+    }
+    pgl.validateFramebuffer();
+
+    pg.popFramebuffer();
+  }
+
+
   ///////////////////////////////////////////////////////////
 
   // Allocate/release framebuffer.
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -1150,8 +1150,10 @@ protected void pushFramebuffer() {
 
 
   protected void setFramebuffer(FrameBuffer fbo) {
-    currentFramebuffer = fbo;
-    currentFramebuffer.bind();
+    if (currentFramebuffer != fbo) {
+      currentFramebuffer = fbo;
+      currentFramebuffer.bind();
+    }
   }
 
 
@@ -1160,9 +1162,12 @@ protected void popFramebuffer() {
       throw new RuntimeException("popFramebuffer call is unbalanced.");
     }
     fbStackDepth--;
-    currentFramebuffer.finish();
-    currentFramebuffer = fbStack[fbStackDepth];
-    currentFramebuffer.bind();
+    FrameBuffer fbo = fbStack[fbStackDepth];
+    if (currentFramebuffer != fbo) {
+      currentFramebuffer.finish();
+      currentFramebuffer = fbo;
+      currentFramebuffer.bind();
+    }
   }
 
 
@@ -5435,20 +5440,6 @@ public void loadTexture() {
       if (offscreenMultisample) {
         offscreenFramebufferMultisample.copy(offscreenFramebuffer);
       }
-
-      // Make the offscreen color buffer opaque so it doesn't show
-      // the background when drawn on the main surface.
-      if (offscreenMultisample) {
-        pushFramebuffer();
-        setFramebuffer(offscreenFramebuffer);
-      }
-      pgl.colorMask(false, false, false, true);
-      pgl.clearColor(0, 0, 0, 1);
-      pgl.clear(PGL.COLOR_BUFFER_BIT);
-      pgl.colorMask(true, true, true, true);
-      if (offscreenMultisample) {
-        popFramebuffer();
-      }
     }
 
     if (needEndDraw) {
