From bdacb6cfae924e042adeba88ae266fbe64c7851e Mon Sep 17 00:00:00 2001
From: codeanticode <andres.colubri@gmail.com>
Date: Thu, 21 Jun 2012 19:30:20 +0000
Subject: [PATCH] framebuffer stack made into an array as well

---
 .../processing/opengl/PGraphicsOpenGL.java    | 31 ++++++++++---------
 .../processing/opengl/PGraphicsOpenGL.java    | 31 ++++++++++---------
 2 files changed, 34 insertions(+), 28 deletions(-)

diff --git a/android/core/src/processing/opengl/PGraphicsOpenGL.java b/android/core/src/processing/opengl/PGraphicsOpenGL.java
index 55e357321..c60188e8a 100644
--- a/android/core/src/processing/opengl/PGraphicsOpenGL.java
+++ b/android/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -36,11 +36,9 @@ import java.net.URL;
 import java.nio.*;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.EmptyStackException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.Stack;
 
 /**
  * OpenGL renderer.
@@ -332,7 +330,10 @@ public class PGraphicsOpenGL extends PGraphics {
 
   // Framebuffer stack:
 
-  static protected Stack<FrameBuffer> fbStack;
+  static protected final int FB_STACK_DEPTH = 16;
+  
+  static protected int fbStackDepth;  
+  static protected FrameBuffer[] fbStack = new FrameBuffer[FB_STACK_DEPTH];
   static protected FrameBuffer screenFramebuffer;
   static protected FrameBuffer currentFramebuffer;
 
@@ -1056,7 +1057,11 @@ public class PGraphicsOpenGL extends PGraphics {
 
 
   public void pushFramebuffer() {
-    fbStack.push(currentFramebuffer);
+    if (fbStackDepth == FB_STACK_DEPTH) {
+      throw new RuntimeException("Too many pushFramebuffer calls");
+    }
+    fbStack[fbStackDepth] = currentFramebuffer;
+    fbStackDepth++;    
   }
 
 
@@ -1066,14 +1071,14 @@ public class PGraphicsOpenGL extends PGraphics {
   }
 
 
-  public void popFramebuffer() {
-    try {
-      currentFramebuffer.finish();
-      currentFramebuffer = fbStack.pop();
-      currentFramebuffer.bind();
-    } catch (EmptyStackException e) {
-      PGraphics.showWarning("P3D: Empty framebuffer stack");
+  public void popFramebuffer() {    
+    if (fbStackDepth == 0) {
+      throw new RuntimeException("popFramebuffer call is unbalanced.");
     }
+    fbStackDepth--;
+    currentFramebuffer.finish();
+    currentFramebuffer = fbStack[fbStackDepth];
+    currentFramebuffer.bind();
   }
 
 
@@ -1928,9 +1933,7 @@ public class PGraphicsOpenGL extends PGraphics {
 
     clearColorBuffer = false;
 
-    if (fbStack == null) {
-      fbStack = new Stack<FrameBuffer>();
-
+    if (screenFramebuffer == null) {
       screenFramebuffer = new FrameBuffer(parent, width, height, true);
       setFramebuffer(screenFramebuffer);
     }
diff --git a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
index 55e357321..c60188e8a 100644
--- a/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
+++ b/java/libraries/opengl/src/processing/opengl/PGraphicsOpenGL.java
@@ -36,11 +36,9 @@ import java.net.URL;
 import java.nio.*;
 import java.util.ArrayList;
 import java.util.Collections;
-import java.util.EmptyStackException;
 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.Set;
-import java.util.Stack;
 
 /**
  * OpenGL renderer.
@@ -332,7 +330,10 @@ public class PGraphicsOpenGL extends PGraphics {
 
   // Framebuffer stack:
 
-  static protected Stack<FrameBuffer> fbStack;
+  static protected final int FB_STACK_DEPTH = 16;
+  
+  static protected int fbStackDepth;  
+  static protected FrameBuffer[] fbStack = new FrameBuffer[FB_STACK_DEPTH];
   static protected FrameBuffer screenFramebuffer;
   static protected FrameBuffer currentFramebuffer;
 
@@ -1056,7 +1057,11 @@ public class PGraphicsOpenGL extends PGraphics {
 
 
   public void pushFramebuffer() {
-    fbStack.push(currentFramebuffer);
+    if (fbStackDepth == FB_STACK_DEPTH) {
+      throw new RuntimeException("Too many pushFramebuffer calls");
+    }
+    fbStack[fbStackDepth] = currentFramebuffer;
+    fbStackDepth++;    
   }
 
 
@@ -1066,14 +1071,14 @@ public class PGraphicsOpenGL extends PGraphics {
   }
 
 
-  public void popFramebuffer() {
-    try {
-      currentFramebuffer.finish();
-      currentFramebuffer = fbStack.pop();
-      currentFramebuffer.bind();
-    } catch (EmptyStackException e) {
-      PGraphics.showWarning("P3D: Empty framebuffer stack");
+  public void popFramebuffer() {    
+    if (fbStackDepth == 0) {
+      throw new RuntimeException("popFramebuffer call is unbalanced.");
     }
+    fbStackDepth--;
+    currentFramebuffer.finish();
+    currentFramebuffer = fbStack[fbStackDepth];
+    currentFramebuffer.bind();
   }
 
 
@@ -1928,9 +1933,7 @@ public class PGraphicsOpenGL extends PGraphics {
 
     clearColorBuffer = false;
 
-    if (fbStack == null) {
-      fbStack = new Stack<FrameBuffer>();
-
+    if (screenFramebuffer == null) {
       screenFramebuffer = new FrameBuffer(parent, width, height, true);
       setFramebuffer(screenFramebuffer);
     }