latest gl updates

Author: codeanticode

core/src/processing/opengl/PGL.java

@@ -878,8 +878,8 @@ private void createFBOLayer() {
       fboHeight = nextPowerOfTwo((int)(scale * graphics.height));
     }
 
-    int maxs = maxSamples();
-    if (hasFboMultisampleSupport() && 1 < maxs) {
+    if (hasFboMultisampleSupport()) {
+      int maxs = maxSamples();
       numSamples = PApplet.min(reqNumSamples, maxs);
     } else {
       numSamples = 1;
@@ -959,7 +959,7 @@ private void createFBOLayer() {
 
   protected void saveFirstFrame() {
     firstFrame = allocateDirectIntBuffer(graphics.width * graphics.height);
-    readBuffer(BACK);
+    if (hasReadBuffer()) readBuffer(BACK);
     readPixelsImpl(0, 0, graphics.width, graphics.height, RGBA, UNSIGNED_BYTE, firstFrame);
   }
 
@@ -2188,6 +2188,24 @@ protected boolean hasPBOs() {
   }
 
 
+  protected boolean hasReadBuffer() {
+    int[] version = getGLVersion();
+    if (isES()) {
+      return version[0] >= 3;
+    }
+    return version[0] >= 2;
+  }
+
+
+  protected boolean hasDrawBuffer() {
+    int[] version = getGLVersion();
+    if (isES()) {
+      return version[0] >= 3;
+    }
+    return version[0] >= 2;
+  }
+
+
   protected int maxSamples() {
     intBuffer.rewind();
     getIntegerv(MAX_SAMPLES, intBuffer);

core/src/processing/opengl/PGLES.java

@@ -226,7 +226,7 @@ protected void initFBOLayer() {
     if (0 < sketch.frameCount) {
       IntBuffer buf = allocateDirectIntBuffer(fboWidth * fboHeight);
 
-      readBuffer(BACK);
+      if (hasReadBuffer()) readBuffer(BACK);
       readPixelsImpl(0, 0, fboWidth, fboHeight, RGBA, UNSIGNED_BYTE, buf);
       bindTexture(TEXTURE_2D, glColorTex.get(frontTex));
       texSubImage2D(TEXTURE_2D, 0, 0, 0, fboWidth, fboHeight, RGBA, UNSIGNED_BYTE, buf);