Merge pull request processing#4524 from gohai/arm-updates

benfry · benfry · commit f167d50dae9a · 2016-06-06T16:39:33.000-04:00
Fix GLExceptions on Raspberry Pi when using offscreen PGraphics
diff --git a/core/src/processing/opengl/PGraphicsOpenGL.java b/core/src/processing/opengl/PGraphicsOpenGL.java
@@ -1607,9 +1607,12 @@ protected void restoreGL() {
     }
     pgl.depthFunc(PGL.LEQUAL);
 
-    if (smooth < 1) {
+    if (OPENGL_RENDERER.equals("VideoCore IV HW")) {
+      // Broadcom's VC IV driver is unhappy with either of these
+      // ignore for now
+    } else if (smooth < 1) {
       pgl.disable(PGL.MULTISAMPLE);
-    } else {
+    } else if (1 <= smooth) {
       pgl.enable(PGL.MULTISAMPLE);
       pgl.disable(PGL.POLYGON_SMOOTH);
     }
@@ -6788,13 +6791,13 @@ protected void setGLSettings() {
 //        quality = temp;
 //      }
     }
-    if (smooth < 1) {
+    if (OPENGL_RENDERER.equals("VideoCore IV HW")) {
+      // Broadcom's VC IV driver is unhappy with either of these
+      // ignore for now
+    } else if (smooth < 1) {
       pgl.disable(PGL.MULTISAMPLE);
-    } else {
-      // work around runtime exceptions in Broadcom's VC IV driver
-      if (false == OPENGL_RENDERER.equals("VideoCore IV HW")) {
-        pgl.enable(PGL.MULTISAMPLE);
-      }
+    } else if (1 <= smooth) {
+      pgl.enable(PGL.MULTISAMPLE);
     }
     // work around runtime exceptions in Broadcom's VC IV driver
     if (false == OPENGL_RENDERER.equals("VideoCore IV HW")) {
