Bug 789: glDrawArraysIndirect and glDrawElementsIndirect are using GL_DRAW_INDIRECT_BUFFER, add VBO variant and range-check

3 files changed, 8 insertions, 2 deletions

diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java b/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java
index 7fdb93e9b..861957c23 100644
--- a/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java
+++ b/src/jogl/classes/com/jogamp/gluegen/opengl/GLConfiguration.java
@@ -127,10 +127,12 @@ public class GLConfiguration extends ProcAddressConfiguration {
                 kind = GLEmitter.BufferObjectKind.ARRAY;
             } else if (kindString.equalsIgnoreCase("Element")) {
                 kind = GLEmitter.BufferObjectKind.ELEMENT;
+            } else if (kindString.equalsIgnoreCase("Indirect")) {
+                kind = GLEmitter.BufferObjectKind.INDIRECT;
             } else {
                 throw new RuntimeException("Error parsing \"BufferObjectKind\" command at line " + lineNo
                         + " in file \"" + filename + "\": illegal BufferObjectKind \""
-                        + kindString + "\", expected one of UnpackPixel, PackPixel, Array, or Element");
+                        + kindString + "\", expected one of UnpackPixel, PackPixel, Array, Element or Indirect");
             }
 
             bufferObjectKinds.put(target, kind);
@@ -171,6 +173,8 @@ public class GLConfiguration extends ProcAddressConfiguration {
                 prologue = prologue + "ArrayVBO";
             } else if (kind == GLEmitter.BufferObjectKind.ELEMENT) {
                 prologue = prologue + "ElementVBO";
+            } else if (kind == GLEmitter.BufferObjectKind.INDIRECT) {
+                prologue = prologue + "IndirectVBO";
             } else {
                 throw new RuntimeException("Unknown BufferObjectKind " + kind);
             }
diff --git a/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java b/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java
index 075c8bfd8..fec90d047 100644
--- a/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java
+++ b/src/jogl/classes/com/jogamp/gluegen/opengl/GLEmitter.java
@@ -74,7 +74,7 @@ public class GLEmitter extends ProcAddressEmitter {
     // Buffer Object variants. Used as a Set rather than a Map.
     private Map<MethodBinding, MethodBinding> bufferObjectMethodBindings = new IdentityHashMap<MethodBinding, MethodBinding>();
 
-    enum BufferObjectKind { UNPACK_PIXEL, PACK_PIXEL, ARRAY, ELEMENT}
+    enum BufferObjectKind { UNPACK_PIXEL, PACK_PIXEL, ARRAY, ELEMENT, INDIRECT}
 
     @Override
     public void beginEmission(GlueEmitterControls controls) throws IOException {
diff --git a/src/jogl/classes/jogamp/opengl/GLBufferStateTracker.java b/src/jogl/classes/jogamp/opengl/GLBufferStateTracker.java
index 890c82c90..f14d16ec4 100644
--- a/src/jogl/classes/jogamp/opengl/GLBufferStateTracker.java
+++ b/src/jogl/classes/jogamp/opengl/GLBufferStateTracker.java
@@ -102,6 +102,7 @@ public class GLBufferStateTracker {
     setBoundBufferObject(GL.GL_ELEMENT_ARRAY_BUFFER, 0);
     setBoundBufferObject(GL2.GL_PIXEL_PACK_BUFFER,   0);
     setBoundBufferObject(GL2.GL_PIXEL_UNPACK_BUFFER, 0);
+    setBoundBufferObject(GL4.GL_DRAW_INDIRECT_BUFFER, 0);
   }
 
   public final void setBoundBufferObject(int target, int value) {
@@ -132,6 +133,7 @@ public class GLBufferStateTracker {
         case GL.GL_ELEMENT_ARRAY_BUFFER:  queryTarget = GL.GL_ELEMENT_ARRAY_BUFFER_BINDING; break;
         case GL2.GL_PIXEL_PACK_BUFFER:    queryTarget = GL2.GL_PIXEL_PACK_BUFFER_BINDING;    break;
         case GL2.GL_PIXEL_UNPACK_BUFFER:  queryTarget = GL2.GL_PIXEL_UNPACK_BUFFER_BINDING;  break;
+        case GL4.GL_DRAW_INDIRECT_BUFFER: queryTarget = GL4.GL_DRAW_INDIRECT_BUFFER_BINDING;  break;
         default:                          gotQueryTarget = false; break;
       }
       if (gotQueryTarget) {