coalesce glClear calls, fixes #4694

codeanticode · codeanticode · commit a1dcc32044b9 · 2016-10-12T15:38:34.000-04:00
diff --git a/core/src/processing/opengl/PGL.java b/core/src/processing/opengl/PGL.java
@@ -636,13 +636,22 @@ public boolean insideStopButton(float x, float y) {
   // Frame rendering
 
 
-  protected void clearBackground(float r, float g, float b, float a, boolean depth) {
-    if (depth) {
+  protected void clearBackground(float r, float g, float b, float a,
+                                 boolean depth, boolean stencil) {
+    clearColor(r, g, b, a);
+    if (depth && stencil) {
+      clearDepth(1);
+      clearStencil(0);
+      clear(DEPTH_BUFFER_BIT | STENCIL_BUFFER_BIT | COLOR_BUFFER_BIT);
+    } else if (depth) {
       clearDepth(1);
-      clear(PGL.DEPTH_BUFFER_BIT);
+      clear(DEPTH_BUFFER_BIT | COLOR_BUFFER_BIT);
+    } else if (stencil) {
+      clearStencil(0);
+      clear(STENCIL_BUFFER_BIT | COLOR_BUFFER_BIT);
+    } else {
+      clear(PGL.COLOR_BUFFER_BIT);
     }
-    clearColor(r, g, b, a);
-    clear(PGL.COLOR_BUFFER_BIT);
     if (0 < sketch.frameCount) {
       clearColor = true;
     }
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -5325,7 +5325,7 @@ protected void backgroundImpl(PImage image) {
   protected void backgroundImpl() {
     flush();
     pgl.clearBackground(backgroundR, backgroundG, backgroundB, backgroundA,
-                        !hints[DISABLE_DEPTH_MASK]);
+                        !hints[DISABLE_DEPTH_MASK], true);
     loaded = false;
   }
 
@@ -6888,12 +6888,6 @@ protected void setGLSettings() {
     normalX = normalY = 0;
     normalZ = 1;
 
-    // Clear depth and stencil buffers.
-    pgl.depthMask(true);
-    pgl.clearDepth(1);
-    pgl.clearStencil(0);
-    pgl.clear(PGL.DEPTH_BUFFER_BIT | PGL.STENCIL_BUFFER_BIT);
-
     if (hints[DISABLE_DEPTH_MASK]) {
       pgl.depthMask(false);
     } else {
