making sure that backing textures are reset when surface is resized

codeanticode · codeanticode · commit 28989b969611 · 2014-01-21T11:23:03.000-05:00
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -508,9 +508,6 @@ public class PGraphicsOpenGL extends PGraphics {
     "Stroke path is too long, some bevel triangles won't be added";
   static final String TESSELLATION_ERROR =
     "Tessellation Error: %1$s";
-  static final String TEXTURE_SIZE_ERROR =
-    "The backing texture for the primary surface has a width/height different " +
-    "from the one given in size().";
 
   //////////////////////////////////////////////////////////////
 
@@ -6260,10 +6257,6 @@ protected void beginOnscreenDraw() {
     if (pgl.isFBOBacked()) {
       texture = pgl.wrapBackTexture(texture);
       ptexture = pgl.wrapFrontTexture(ptexture);
-
-      if (texture.glWidth != width || texture.glHeight != height) {
-        PGraphics.showWarning(TEXTURE_SIZE_ERROR);
-      }
     }
   }
 
@@ -6428,7 +6421,7 @@ protected void setDrawDefaults() {
     pgl.disable(PGL.POLYGON_SMOOTH);
 
     if (sized) {
-      //reapplySettings();
+//      reapplySettings();
 
       // To avoid having garbage in the screen after a resize,
       // in the case background is not called in draw().
diff --git a/core/src/processing/opengl/PJOGL.java b/core/src/processing/opengl/PJOGL.java
@@ -113,7 +113,7 @@ public class PJOGL extends PGL {
       WINDOW_TOOLKIT = AWT;
       EVENTS_TOOLKIT = AWT;
       USE_FBOLAYER_BY_DEFAULT = true;
-      USE_JOGL_FBOLAYER = true;
+      USE_JOGL_FBOLAYER = false;
     } else if (PApplet.platform == PConstants.LINUX) {
       WINDOW_TOOLKIT = AWT;
       EVENTS_TOOLKIT = AWT;
@@ -820,14 +820,15 @@ public void display(GLAutoDrawable glDrawable) {
               frontTexAttach = (FBObject.TextureAttachment)frontFBO.
                                getColorbuffer(0);
             } else {
+              changedFrontTex = changedBackTex = sinkFBO == null;
+
               // Default setting (to save resources): the front and back
               // textures are the same.
               sinkFBO = backFBO.getSamplingSinkFBO();
               backTexAttach = (FBObject.TextureAttachment) sinkFBO.
                               getColorbuffer(0);
               frontTexAttach = backTexAttach;
             }
-
           } else {
             // w/out multisampling, rendering is done on the back buffer.
             frontFBO = fboDrawable.getFBObject(GL.GL_FRONT);
