Retry with multisampling disabled if creating a framebuffer fails because of INCOMPLETE_MULTISAMPLE

gohai · gohai · commit 369822982b51 · 2017-02-19T09:56:50.000+01:00
diff --git a/core/src/processing/opengl/PGL.java b/core/src/processing/opengl/PGL.java
@@ -961,7 +961,16 @@ private void createFBOLayer() {
       createDepthAndStencilBuffer(true, depthBits, stencilBits, packed);
     }
 
-    validateFramebuffer();
+    int status = validateFramebuffer();
+
+    if (status == FRAMEBUFFER_INCOMPLETE_MULTISAMPLE && 1 < numSamples) {
+      System.err.println("Continuing with multisampling disabled");
+      reqNumSamples = 1;
+      destroyFBOLayer();
+      // try again
+      createFBOLayer();
+      return;
+    }
 
     // Clear all buffers.
     clearDepth(1);
@@ -2048,10 +2057,10 @@ protected boolean linked(int program) {
   }
 
 
-  protected boolean validateFramebuffer() {
+  protected int validateFramebuffer() {
     int status = checkFramebufferStatus(FRAMEBUFFER);
     if (status == FRAMEBUFFER_COMPLETE) {
-      return true;
+      return 0;
     } else if (status == FRAMEBUFFER_UNDEFINED) {
       System.err.println(String.format(FRAMEBUFFER_ERROR,
                                        "framebuffer undefined"));
@@ -2086,7 +2095,7 @@ protected boolean validateFramebuffer() {
       System.err.println(String.format(FRAMEBUFFER_ERROR,
                                        "unknown error " + status));
     }
-    return false;
+    return status;
   }
 
   protected boolean isES() {
