updated to latest gl changes

Author: codeanticode

core/src/processing/opengl/PGraphicsOpenGL.java

@@ -655,9 +655,9 @@ public void dispose() { // PGraphics
   @Override
   protected void finalize() throws Throwable {
     try {
-      deletePolyBuffers();
-      deleteLineBuffers();
-      deletePointBuffers();
+      finalizePolyBuffers();
+      finalizeLineBuffers();
+      finalizePointBuffers();
 
       deleteSurfaceTextures();
       if (!primarySurface) {
@@ -1412,6 +1412,45 @@ protected void deletePolyBuffers() {
   }
 
 
+  protected void finalizePolyBuffers() {
+    if (glPolyVertex != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glPolyVertex, polyBuffersContext);
+    }
+
+    if (glPolyColor != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glPolyColor, polyBuffersContext);
+    }
+
+    if (glPolyNormal != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glPolyNormal, polyBuffersContext);
+    }
+
+    if (glPolyTexcoord != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glPolyTexcoord, polyBuffersContext);
+    }
+
+    if (glPolyAmbient != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glPolyAmbient, polyBuffersContext);
+    }
+
+    if (glPolySpecular != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glPolySpecular, polyBuffersContext);
+    }
+
+    if (glPolyEmissive != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glPolyEmissive, polyBuffersContext);
+    }
+
+    if (glPolyShininess != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glPolyShininess, polyBuffersContext);
+    }
+
+    if (glPolyIndex != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glPolyIndex, polyBuffersContext);
+    }
+  }
+
+
   protected void createLineBuffers() {
     if (!lineBuffersCreated || lineBufferContextIsOutdated()) {
       lineBuffersContext = pgl.getCurrentContext();
@@ -1506,6 +1545,25 @@ protected void deleteLineBuffers() {
   }
 
 
+  protected void finalizeLineBuffers() {
+    if (glLineVertex != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glLineVertex, lineBuffersContext);
+    }
+
+    if (glLineColor != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glLineColor, lineBuffersContext);
+    }
+
+    if (glLineAttrib != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glLineAttrib, lineBuffersContext);
+    }
+
+    if (glLineIndex != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glLineIndex, lineBuffersContext);
+    }
+  }
+
+
   protected void createPointBuffers() {
     if (!pointBuffersCreated || pointBuffersContextIsOutdated()) {
       pointBuffersContext = pgl.getCurrentContext();
@@ -1599,6 +1657,25 @@ protected void deletePointBuffers() {
   }
 
 
+  protected void finalizePointBuffers() {
+    if (glPointVertex != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glPointVertex, pointBuffersContext);
+    }
+
+    if (glPointColor != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glPointColor, pointBuffersContext);
+    }
+
+    if (glPointAttrib != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glPointAttrib, pointBuffersContext);
+    }
+
+    if (glPointIndex != 0) {
+      PGraphicsOpenGL.finalizeVertexBufferObject(glPointIndex, pointBuffersContext);
+    }
+  }
+
+
   @Override
   public void requestFocus() {  // ignore
     pgl.requestFocus();
@@ -1620,7 +1697,7 @@ public void requestDraw() {
     if (primarySurface) {
       if (initialized) {
         if (sized) pgl.reinitSurface();
-        pgl.requestDraw();
+        if (parent.canDraw()) pgl.requestDraw();
       } else {
         initPrimary();
       }

core/src/processing/opengl/PShader.java

@@ -117,7 +117,7 @@ public class PShader implements PConstants {
   protected int modelviewMatLoc;
   protected int projectionMatLoc;
   protected int ppixelsLoc;
-  protected int bufferUnit;
+  protected int ppixelsUnit;
   protected int viewportLoc;
 
   // Uniforms only for lines and points
@@ -1210,12 +1210,12 @@ protected void setCommonUniforms() {
     }
 
     if (-1 < ppixelsLoc) {
-      bufferUnit = getLastTexUnit() + 1;
-      setUniformValue(ppixelsLoc, bufferUnit);
-      pgl.activeTexture(PGL.TEXTURE0 + bufferUnit);
+      ppixelsUnit = getLastTexUnit() + 1;
+      setUniformValue(ppixelsLoc, ppixelsUnit);
+      pgl.activeTexture(PGL.TEXTURE0 + ppixelsUnit);
       currentPG.bindFrontTexture();
     } else {
-      bufferUnit = -1;
+      ppixelsUnit = -1;
     }
   }
 
@@ -1306,7 +1306,7 @@ protected void unbindTyped() {
 
     if (-1 < ppixelsLoc) {
       pgl.requestFBOLayer();
-      pgl.activeTexture(PGL.TEXTURE0 + bufferUnit);
+      pgl.activeTexture(PGL.TEXTURE0 + ppixelsUnit);
       currentPG.unbindFrontTexture();
       pgl.activeTexture(PGL.TEXTURE0);
     }
@@ -1341,7 +1341,7 @@ protected void setTexture(Texture tex) {
       setUniformValue(texOffsetLoc, 1.0f / tex.width, 1.0f / tex.height);
 
       if (-1 < textureLoc) {
-        texUnit =  -1 < bufferUnit ? bufferUnit + 1 : getLastTexUnit() + 1;
+        texUnit =  -1 < ppixelsUnit ? ppixelsUnit + 1 : getLastTexUnit() + 1;
         setUniformValue(textureLoc, texUnit);
         pgl.activeTexture(PGL.TEXTURE0 + texUnit);
         tex.bind();