merged in changes from desktop gl

Author: codeanticode

core/src/processing/core/PConstants.java

@@ -422,7 +422,10 @@ public interface PConstants {
   static final int ENABLE_STROKE_PURE         =  9;
   static final int DISABLE_STROKE_PURE        = -9;
 
-  static final int HINT_COUNT                 = 10;
+  static final int ENABLE_BUFFER_READING       =  10;
+  static final int DISABLE_BUFFER_READING      = -10;
+
+  static final int HINT_COUNT                 =  11;
 
 
   // error messages

core/src/processing/core/PGraphics.java

@@ -1072,6 +1072,22 @@ public void normal(float nx, float ny, float nz) {
     }
   }
 
+
+  public void attribPosition(String name, float x, float y, float z) {
+    showMissingWarning("attrib");
+  }
+
+
+  public void attribNormal(String name, float nx, float ny, float nz) {
+    showMissingWarning("attrib");
+  }
+
+
+  public void attribColor(String name, int color) {
+    showMissingWarning("attrib");
+  }
+
+
   public void attrib(String name, float... values) {
     showMissingWarning("attrib");
   }

core/src/processing/core/PShape.java

@@ -115,6 +115,9 @@ public class PShape implements PConstants {
   static public final String NO_VERTICES_ERROR =
     "getVertexCount() only works with PATH or GEOMETRY shapes";
 
+  public static final String NOT_A_SIMPLE_VERTEX =
+    "%1$s can not be called on quadratic or bezier vertices";
+
   // boundary box of this shape
   //protected float x;
   //protected float y;
@@ -716,6 +719,17 @@ public void normal(float nx, float ny, float nz) {
   }
 
 
+  public void attribPosition(String name, float x, float y, float z) {
+  }
+
+  public void attribNormal(String name, float nx, float ny, float nz) {
+  }
+
+
+  public void attribColor(String name, int color) {
+  }
+
+
   public void attrib(String name, float... values) {
   }
 

core/src/processing/opengl/FontTexture.java

@@ -264,9 +264,10 @@ public boolean contextIsOutdated() {
     }
     if (outdated) {
       for (int i = 0; i < textures.length; i++) {
-        PGraphicsOpenGL.removeTextureObject(textures[i].glName,
-                                            textures[i].context);
-        textures[i].glName = 0;
+        textures[i].dispose();
+//        PGraphicsOpenGL.removeTextureObject(textures[i].glName,
+//                                            textures[i].context);
+//        textures[i].glName = 0;
       }
     }
     return outdated;