enable layer FBO layer when no background is called, so there should be

no need for surface hack.
processing · Aug 13, 2015 · eeb9dec · eeb9dec
1 parent 26a9ffb
commit eeb9dec
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 13 deletions.
diff --git a/core/src/processing/opengl/PGL.java b/core/src/processing/opengl/PGL.java
@@ -80,7 +80,7 @@ public abstract class PGL {
    * See the code and comments involving this constant in
    * PGraphicsOpenGL.endDraw().
    */
-  protected static boolean SAVE_SURFACE_TO_PIXELS_HACK = true;
+  protected static boolean SAVE_SURFACE_TO_PIXELS_HACK = false;
 
   /** Enables/disables mipmap use. */
   protected static boolean MIPMAPS_ENABLED = true;
@@ -625,7 +625,7 @@ protected void beginDraw(boolean clear0) {
 
 
   IntBuffer labelTex;
-  protected void endDraw(boolean clear0, int windowColor) {
+  protected void endDraw(boolean clear, int windowColor) {
     if (fboLayerInUse) {
       syncBackTexture();
 
@@ -705,6 +705,8 @@ protected void endDraw(boolean clear0, int windowColor) {
       int temp = frontTex;
       frontTex = backTex;
       backTex = temp;
+    } else if (!clear && pg.parent.frameCount == 1) {
+      requestFBOLayer();
     }
   }
 
@@ -754,6 +756,8 @@ private void createFBOLayer() {
     String ext = getString(EXTENSIONS);
     float scale = pg.getPixelScale();
 
+    System.err.println("creating fbo layer");
+
     if (-1 < ext.indexOf("texture_non_power_of_two")) {
       fboWidth = (int)(scale * pg.width);
       fboHeight = (int)(scale * pg.height);

diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -1999,26 +1999,18 @@ protected boolean pointBuffersContextIsOutdated() {
 
   @Override
   public void beginDraw() {
-    if (primaryGraphics) {
-//      if (initialized) {
-//        if (sized) pgl.reinitSurface();
-//        if (parent.canDraw()) pgl.requestDraw();
-//      } else {
-//        initPrimary();
-//      }
+    report("top beginDraw()");
 
+    if (primaryGraphics) {
       if (!initialized) {
         initPrimary();
       }
-
       setCurrentPG(this);
     } else {
       pgl.getGL(getPrimaryPGL());
       getPrimaryPG().setCurrentPG(this);
     }
 
-    report("top beginDraw()");
-
     if (!checkGLThread()) {
       return;
     }
@@ -6879,7 +6871,7 @@ protected void beginOnscreenDraw() {
 
 
   protected void endOnscreenDraw() {
-    pgl.endDraw(clearColorBuffer0, parent.sketchWindowColor());
+    pgl.endDraw(clearColorBuffer, parent.sketchWindowColor());
   }