move drawElements() call to PShader.draw()

Author: codeanticode

core/src/processing/opengl/PGraphicsOpenGL.java

@@ -2420,10 +2420,7 @@ protected void flushPolys() {
           shader.setTexture(tex);
         }
 
-        pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, glPolyIndex);
-        pgl.drawElements(PGL.TRIANGLES, icount, PGL.INDEX_TYPE,
-                         ioffset * PGL.SIZEOF_INDEX);
-        pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, 0);
+        shader.draw(glPolyIndex, icount, ioffset);
       }
 
       shader.unbind();
@@ -2557,10 +2554,7 @@ protected void flushLines() {
       shader.setLineAttribute(glLineAttrib, 4, PGL.FLOAT, 0,
                               4 * voffset * PGL.SIZEOF_FLOAT);
 
-      pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, glLineIndex);
-      pgl.drawElements(PGL.TRIANGLES, icount, PGL.INDEX_TYPE,
-                       ioffset * PGL.SIZEOF_INDEX);
-      pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, 0);
+      shader.draw(glLineIndex, icount, ioffset);
     }
 
     shader.unbind();
@@ -2661,10 +2655,7 @@ protected void flushPoints() {
       shader.setPointAttribute(glPointAttrib, 2, PGL.FLOAT, 0,
                                2 * voffset * PGL.SIZEOF_FLOAT);
 
-      pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, glPointIndex);
-      pgl.drawElements(PGL.TRIANGLES, icount, PGL.INDEX_TYPE,
-                       ioffset * PGL.SIZEOF_INDEX);
-      pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, 0);
+      shader.draw(glPointIndex, icount, ioffset);
     }
 
     shader.unbind();

core/src/processing/opengl/PShader.java

@@ -579,6 +579,14 @@ protected void setup() {
   }
 
 
+  protected void draw(int idxId, int count, int offset) {
+    pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, idxId);
+    pgl.drawElements(PGL.TRIANGLES, count, PGL.INDEX_TYPE,
+                     offset * PGL.SIZEOF_INDEX);
+    pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, 0);
+  }
+
+
   /**
    * Returns the ID location of the attribute parameter given its name.
    *
@@ -1149,7 +1157,7 @@ protected void loadUniforms() {
 
     textureLoc = getUniformLoc("texture");
     if (textureLoc == -1) {
-      textureLoc = getUniformLoc("texSampler");
+      textureLoc = getUniformLoc("texMap");
     }
 
     texMatrixLoc = getUniformLoc("texMatrix");

core/src/processing/opengl/PShapeOpenGL.java

@@ -4681,10 +4681,7 @@ protected void renderPolys(PGraphicsOpenGL g, PImage textureImage) {
         shader.setTexture(tex);
       }
 
-      pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, root.glPolyIndex);
-      pgl.drawElements(PGL.TRIANGLES, icount, PGL.INDEX_TYPE,
-                       ioffset * PGL.SIZEOF_INDEX);
-      pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, 0);
+      shader.draw(root.glPolyIndex, icount, ioffset);
     }
 
     if (shader != null && shader.bound()) {
@@ -4805,10 +4802,7 @@ protected void renderLines(PGraphicsOpenGL g) {
       shader.setLineAttribute(root.glLineAttrib, 4, PGL.FLOAT,
                               0, 4 * voffset * PGL.SIZEOF_FLOAT);
 
-      pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, root.glLineIndex);
-      pgl.drawElements(PGL.TRIANGLES, icount, PGL.INDEX_TYPE,
-                       ioffset * PGL.SIZEOF_INDEX);
-      pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, 0);
+      shader.draw(root.glLineIndex, icount, ioffset);
     }
 
     shader.unbind();
@@ -4905,10 +4899,7 @@ protected void renderPoints(PGraphicsOpenGL g) {
       shader.setPointAttribute(root.glPointAttrib, 2, PGL.FLOAT,
                                0, 2 * voffset * PGL.SIZEOF_FLOAT);
 
-      pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, root.glPointIndex);
-      pgl.drawElements(PGL.TRIANGLES, icount, PGL.INDEX_TYPE,
-                       ioffset * PGL.SIZEOF_INDEX);
-      pgl.bindBuffer(PGL.ELEMENT_ARRAY_BUFFER, 0);
+      shader.draw(root.glPointIndex, icount, ioffset);
     }
 
     shader.unbind();