From 325986eb0b14e90d9ef35cbb0ca57c9c91df4827 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Thu, 13 Feb 2014 03:33:03 +0100 Subject: Bug 974 - Add missing [GL4] glMultiDrawArraysIndirect(int mode, int type, long indirect_offset, int drawcount, int stride) --- make/config/jogl/gl-common-gpubufferonly.cfg | 1 + make/config/jogl/gl-common.cfg | 1 + make/config/jogl/gl4bc-common-cpubufferJavaCode.java | 4 ++++ 3 files changed, 6 insertions(+) diff --git a/make/config/jogl/gl-common-gpubufferonly.cfg b/make/config/jogl/gl-common-gpubufferonly.cfg index 14671f353..9370d9502 100644 --- a/make/config/jogl/gl-common-gpubufferonly.cfg +++ b/make/config/jogl/gl-common-gpubufferonly.cfg @@ -44,6 +44,7 @@ BufferObjectOnly glDrawElementsInstancedBaseVertex BufferObjectOnly glDrawElementsInstancedBaseVertexBaseInstance BufferObjectOnly glDrawRangeElements BufferObjectOnly glDrawRangeElementsBaseVertex +BufferObjectOnly glMultiDrawArraysIndirect BufferObjectOnly glDrawArraysIndirect BufferObjectOnly glDrawElementsIndirect diff --git a/make/config/jogl/gl-common.cfg b/make/config/jogl/gl-common.cfg index 74ead0498..d5c45314e 100644 --- a/make/config/jogl/gl-common.cfg +++ b/make/config/jogl/gl-common.cfg @@ -651,6 +651,7 @@ BufferObjectKind Element glDrawRangeElementsBaseVertex BufferObjectKind Indirect glDrawArraysIndirect BufferObjectKind Indirect glDrawElementsIndirect +BufferObjectKind Indirect glMultiDrawArraysIndirect # There are no PBOs in the embedded OpenGL variants right now BufferObjectKind UnpackPixel glBitmap diff --git a/make/config/jogl/gl4bc-common-cpubufferJavaCode.java b/make/config/jogl/gl4bc-common-cpubufferJavaCode.java index a29f540fa..39dc9f6c4 100644 --- a/make/config/jogl/gl4bc-common-cpubufferJavaCode.java +++ b/make/config/jogl/gl4bc-common-cpubufferJavaCode.java @@ -7,6 +7,10 @@ @param indirect a direct or array-backed {@link java.nio.Buffer} */ public void glDrawElementsIndirect(int mode, int type, Buffer indirect); + /** Entry point to C language function: void {@native glMultiDrawArraysIndirect}(GLenum mode, const void * indirect, GLsizei drawcount, GLsizei stride);
Part of GL_VERSION_4_3, GL_ARB_multi_draw_indirect + @param indirect a direct or array-backed {@link java.nio.Buffer} */ + public void glMultiDrawArraysIndirect(int mode, Buffer indirect, int drawcount, int stride); + /** Entry point to C language function: void {@native glDrawElementsInstancedBaseInstance}(GLenum mode, GLsizei count, GLenum type, const void * indices, GLsizei instancecount, GLuint baseinstance);
Part of GL_VERSION_4_2, GL_ARB_base_instance @param indices a direct or array-backed {@link java.nio.Buffer} */ public void glDrawElementsInstancedBaseInstance(int mode, int count, int type, Buffer indices, int instancecount, int baseinstance); -- cgit v1.2.3