fix point and line shader autodetection

Author: codeanticode

core/src/processing/opengl/PShader.java

@@ -51,8 +51,12 @@ public class PShader implements PConstants {
 
   static protected String pointShaderAttrRegexp =
     "attribute *vec2 *offset";
+  static protected String pointShaderInRegexp =
+    "in *vec2 *offset;";
   static protected String lineShaderAttrRegexp =
     "attribute *vec4 *direction";
+  static protected String lineShaderInRegexp =
+    "in *vec4 *direction";
   static protected String pointShaderDefRegexp =
     "#define *PROCESSING_POINT_SHADER";
   static protected String lineShaderDefRegexp =
@@ -1016,15 +1020,8 @@ protected void dispose() {
   static protected int getShaderType(String[] source, int defaultType) {
     for (int i = 0; i < source.length; i++) {
       String line = source[i].trim();
-      if (PApplet.match(line, pointShaderAttrRegexp) != null)
-        return PShader.POINT;
-      else if (PApplet.match(line, lineShaderAttrRegexp) != null)
-        return PShader.LINE;
-      else if (PApplet.match(line, pointShaderDefRegexp) != null)
-        return PShader.POINT;
-      else if (PApplet.match(line, lineShaderDefRegexp) != null)
-        return PShader.LINE;
-      else if (PApplet.match(line, colorShaderDefRegexp) != null)
+
+      if (PApplet.match(line, colorShaderDefRegexp) != null)
         return PShader.COLOR;
       else if (PApplet.match(line, lightShaderDefRegexp) != null)
         return PShader.LIGHT;
@@ -1038,6 +1035,18 @@ else if (PApplet.match(line, triShaderAttrRegexp) != null)
         return PShader.POLY;
       else if (PApplet.match(line, quadShaderAttrRegexp) != null)
         return PShader.POLY;
+      else if (PApplet.match(line, pointShaderDefRegexp) != null)
+        return PShader.POINT;
+      else if (PApplet.match(line, lineShaderDefRegexp) != null)
+        return PShader.LINE;
+      else if (PApplet.match(line, pointShaderAttrRegexp) != null)
+        return PShader.POINT;
+      else if (PApplet.match(line, pointShaderInRegexp) != null)
+        return PShader.POINT;
+      else if (PApplet.match(line, lineShaderAttrRegexp) != null)
+        return PShader.LINE;
+      else if (PApplet.match(line, lineShaderInRegexp) != null)
+        return PShader.LINE;
     }
     return defaultType;
   }