Merge branch 'master' of github.com:processing/processing

benfry · benfry · commit fc340bec5e19 · 2016-09-20T15:09:51.000-04:00
diff --git a/core/src/processing/opengl/PJOGL.java b/core/src/processing/opengl/PJOGL.java
@@ -1701,7 +1701,7 @@ public void getProgramiv(int program, int pname, IntBuffer params) {
   @Override
   public String getProgramInfoLog(int program) {
     int[] val = { 0 };
-    gl2.glGetShaderiv(program, GL2ES2.GL_INFO_LOG_LENGTH, val, 0);
+    gl2.glGetProgramiv(program, GL2ES2.GL_INFO_LOG_LENGTH, val, 0);
     int length = val[0];
 
     if (0 < length) {
