Android sync

Author: codeanticode

core/src/processing/core/PApplet.java

@@ -819,7 +819,7 @@ public SketchSurfaceViewGL(Context context, int wide, int high, boolean is3D) {
       setEGLContextClientVersion(2);
 
       // The renderer can be set only once.
-      setRenderer(((PGLES)PGraphicsOpenGL.pgl).getRenderer());
+      setRenderer(((PGLES)g3.pgl).getRenderer());
       setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
 
       // assign this g to the PApplet

core/src/processing/opengl/FontTexture.java

@@ -63,8 +63,9 @@ class FontTexture implements PConstants {
   protected TextureInfo[] glyphTexinfos;
   protected HashMap<PFont.Glyph, TextureInfo> texinfoMap;
 
+
   public FontTexture(PGraphicsOpenGL pg, PFont font, boolean is3D) {
-    pgl = PGraphicsOpenGL.pgl;
+    pgl = pg.pgl;
     this.is3D = is3D;
 
     initTexture(pg, font);
@@ -130,15 +131,15 @@ public boolean addTexture(PGraphicsOpenGL pg) {
     if (is3D) {
       // Bilinear sampling ensures that the texture doesn't look pixelated
       // either when it is magnified or minified...
-      tex = new Texture(w, h, new Texture.Parameters(ARGB, Texture.BILINEAR,
-                                                     false));
+      tex = new Texture(pg, w, h,
+                        new Texture.Parameters(ARGB, Texture.BILINEAR, false));
     } else {
       // ...however, the effect of bilinear sampling is to add some blurriness
       // to the text in its original size. In 2D, we assume that text will be
       // shown at its original size, so linear sampling is chosen instead (which
       // only affects minimized text).
-      tex = new Texture(w, h, new Texture.Parameters(ARGB, Texture.LINEAR,
-                                                     false));
+      tex = new Texture(pg, w, h,
+                        new Texture.Parameters(ARGB, Texture.LINEAR, false));
     }
 
     if (textures == null) {

core/src/processing/opengl/FrameBuffer.java

@@ -40,6 +40,7 @@
  */
 
 public class FrameBuffer implements PConstants {
+  protected PGraphicsOpenGL pg;
   protected PGL pgl;
   protected int context;   // The context that created this framebuffer.
 
@@ -67,16 +68,17 @@ public class FrameBuffer implements PConstants {
   protected IntBuffer pixelBuffer;
 
 
-  FrameBuffer() {
-    pgl = PGraphicsOpenGL.pgl;
+  FrameBuffer(PGraphicsOpenGL pg) {
+    this.pg = pg;
+    pgl = pg.pgl;
     context = pgl.createEmptyContext();
   }
 
 
-  FrameBuffer(int w, int h, int samples, int colorBuffers,
-               int depthBits, int stencilBits, boolean packedDepthStencil,
-               boolean screen) {
-    this();
+  FrameBuffer(PGraphicsOpenGL pg, int w, int h, int samples, int colorBuffers,
+              int depthBits, int stencilBits, boolean packedDepthStencil,
+              boolean screen) {
+    this(pg);
 
     glFbo = 0;
     glDepth = 0;
@@ -136,13 +138,13 @@ public class FrameBuffer implements PConstants {
   }
 
 
-  FrameBuffer(int w, int h) {
-    this(w, h, 1, 1, 0, 0, false, false);
+  FrameBuffer(PGraphicsOpenGL pg, int w, int h) {
+    this(pg, w, h, 1, 1, 0, 0, false, false);
   }
 
 
-  FrameBuffer(int w, int h, boolean screen) {
-    this(w, h, 1, 1, 0, 0, false, screen);
+  FrameBuffer(PGraphicsOpenGL pg, int w, int h, boolean screen) {
+    this(pg, w, h, 1, 1, 0, 0, false, screen);
   }
 
 
@@ -172,25 +174,36 @@ protected void finalize() throws Throwable {
   }
 
   public void clear() {
-    PGraphicsOpenGL.pushFramebuffer();
-    PGraphicsOpenGL.setFramebuffer(this);
+    pg.pushFramebuffer();
+    pg.setFramebuffer(this);
     pgl.clearDepth(1);
     pgl.clearStencil(0);
     pgl.clearColor(0, 0, 0, 0);
     pgl.clear(PGL.DEPTH_BUFFER_BIT |
               PGL.STENCIL_BUFFER_BIT |
               PGL.COLOR_BUFFER_BIT);
-    PGraphicsOpenGL.popFramebuffer();
+    pg.popFramebuffer();
   }
 
-  public void copy(FrameBuffer dest, FrameBuffer current) {
+  public void copyColor(FrameBuffer dest) {
+    copy(dest, PGL.COLOR_BUFFER_BIT);
+  }
+
+  public void copyDepth(FrameBuffer dest) {
+    copy(dest, PGL.DEPTH_BUFFER_BIT);
+  }
+
+  public void copyStencil(FrameBuffer dest) {
+    copy(dest, PGL.STENCIL_BUFFER_BIT);
+  }
+
+  public void copy(FrameBuffer dest, int mask) {
     pgl.bindFramebuffer(PGL.READ_FRAMEBUFFER, this.glFbo);
     pgl.bindFramebuffer(PGL.DRAW_FRAMEBUFFER, dest.glFbo);
     pgl.blitFramebuffer(0, 0, this.width, this.height,
-                          0, 0, dest.width, dest.height,
-                          PGL.COLOR_BUFFER_BIT, PGL.NEAREST);
-    pgl.bindFramebuffer(PGL.READ_FRAMEBUFFER, current.glFbo);
-    pgl.bindFramebuffer(PGL.DRAW_FRAMEBUFFER, current.glFbo);
+                        0, 0, dest.width, dest.height, mask, PGL.NEAREST);
+    pgl.bindFramebuffer(PGL.READ_FRAMEBUFFER, pg.getCurrentFB().glFbo);
+    pgl.bindFramebuffer(PGL.DRAW_FRAMEBUFFER, pg.getCurrentFB().glFbo);
   }
 
   public void bind() {
@@ -201,7 +214,7 @@ public void disableDepthTest() {
     noDepth = true;
   }
 
-  public void finish(PGraphicsOpenGL pg) {
+  public void finish() {
     if (noDepth) {
       // No need to clear depth buffer because depth testing was disabled.
       if (pg.getHint(ENABLE_DEPTH_TEST)) {
@@ -271,8 +284,8 @@ public void setColorBuffers(Texture[] textures, int n) {
       colorBufferTex[i] = textures[i];
     }
 
-    PGraphicsOpenGL.pushFramebuffer();
-    PGraphicsOpenGL.setFramebuffer(this);
+    pg.pushFramebuffer();
+    pg.setFramebuffer(this);
 
     // Making sure nothing is attached.
     for (int i = 0; i < numColorBuffers; i++) {
@@ -288,7 +301,7 @@ public void setColorBuffers(Texture[] textures, int n) {
 
     pgl.validateFramebuffer();
 
-    PGraphicsOpenGL.popFramebuffer();
+    pg.popFramebuffer();
   }
 
 
@@ -300,16 +313,16 @@ public void swapColorBuffers() {
       colorBufferTex[i1] = tmp;
     }
 
-    PGraphicsOpenGL.pushFramebuffer();
-    PGraphicsOpenGL.setFramebuffer(this);
+    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();
 
-    PGraphicsOpenGL.popFramebuffer();
+    pg.popFramebuffer();
   }
 
 
@@ -345,7 +358,7 @@ protected void allocate() {
       glFbo = 0;
     } else {
       //create the FBO object...
-      glFbo = PGraphicsOpenGL.createFrameBufferObject(context);
+      glFbo = PGraphicsOpenGL.createFrameBufferObject(context, pgl);
 
       // ... and then create the rest of the stuff.
       if (multisample) {
@@ -420,17 +433,17 @@ protected boolean contextIsOutdated() {
   protected void createColorBufferMultisample() {
     if (screenFb) return;
 
-    PGraphicsOpenGL.pushFramebuffer();
-    PGraphicsOpenGL.setFramebuffer(this);
+    pg.pushFramebuffer();
+    pg.setFramebuffer(this);
 
-    glMultisample = PGraphicsOpenGL.createRenderBufferObject(context);
+    glMultisample = PGraphicsOpenGL.createRenderBufferObject(context, pgl);
     pgl.bindRenderbuffer(PGL.RENDERBUFFER, glMultisample);
     pgl.renderbufferStorageMultisample(PGL.RENDERBUFFER, nsamples,
                                        PGL.RGBA8, width, height);
     pgl.framebufferRenderbuffer(PGL.FRAMEBUFFER, PGL.COLOR_ATTACHMENT0,
                                 PGL.RENDERBUFFER, glMultisample);
 
-    PGraphicsOpenGL.popFramebuffer();
+    pg.popFramebuffer();
   }
 
 
@@ -441,10 +454,10 @@ protected void createPackedDepthStencilBuffer() {
       throw new RuntimeException("PFramebuffer: size undefined.");
     }
 
-    PGraphicsOpenGL.pushFramebuffer();
-    PGraphicsOpenGL.setFramebuffer(this);
+    pg.pushFramebuffer();
+    pg.setFramebuffer(this);
 
-    glDepthStencil = PGraphicsOpenGL.createRenderBufferObject(context);
+    glDepthStencil = PGraphicsOpenGL.createRenderBufferObject(context, pgl);
     pgl.bindRenderbuffer(PGL.RENDERBUFFER, glDepthStencil);
 
     if (multisample) {
@@ -460,7 +473,7 @@ protected void createPackedDepthStencilBuffer() {
     pgl.framebufferRenderbuffer(PGL.FRAMEBUFFER, PGL.STENCIL_ATTACHMENT,
                                 PGL.RENDERBUFFER, glDepthStencil);
 
-    PGraphicsOpenGL.popFramebuffer();
+    pg.popFramebuffer();
   }
 
 
@@ -471,10 +484,10 @@ protected void createDepthBuffer() {
       throw new RuntimeException("PFramebuffer: size undefined.");
     }
 
-    PGraphicsOpenGL.pushFramebuffer();
-    PGraphicsOpenGL.setFramebuffer(this);
+    pg.pushFramebuffer();
+    pg.setFramebuffer(this);
 
-    glDepth = PGraphicsOpenGL.createRenderBufferObject(context);
+    glDepth = PGraphicsOpenGL.createRenderBufferObject(context, pgl);
     pgl.bindRenderbuffer(PGL.RENDERBUFFER, glDepth);
 
     int glConst = PGL.DEPTH_COMPONENT16;
@@ -496,7 +509,7 @@ protected void createDepthBuffer() {
     pgl.framebufferRenderbuffer(PGL.FRAMEBUFFER, PGL.DEPTH_ATTACHMENT,
                                 PGL.RENDERBUFFER, glDepth);
 
-    PGraphicsOpenGL.popFramebuffer();
+    pg.popFramebuffer();
   }
 
 
@@ -507,10 +520,10 @@ protected void createStencilBuffer() {
       throw new RuntimeException("PFramebuffer: size undefined.");
     }
 
-    PGraphicsOpenGL.pushFramebuffer();
-    PGraphicsOpenGL.setFramebuffer(this);
+    pg.pushFramebuffer();
+    pg.setFramebuffer(this);
 
-    glStencil = PGraphicsOpenGL.createRenderBufferObject(context);
+    glStencil = PGraphicsOpenGL.createRenderBufferObject(context, pgl);
     pgl.bindRenderbuffer(PGL.RENDERBUFFER, glStencil);
 
     int glConst = PGL.STENCIL_INDEX1;
@@ -531,7 +544,7 @@ protected void createStencilBuffer() {
     pgl.framebufferRenderbuffer(PGL.FRAMEBUFFER, PGL.STENCIL_ATTACHMENT,
                                 PGL.RENDERBUFFER, glStencil);
 
-    PGraphicsOpenGL.popFramebuffer();
+    pg.popFramebuffer();
   }