summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Leech <devrel@oddhack.org>2017-07-26 22:43:52 -0700
committerGitHub <noreply@github.com>2017-07-26 22:43:52 -0700
commit3d5186ca35d8d14f17174630eb23e35c7352f67b (patch)
treea2fe91b8d93ba05dc8cd6361a6d077bf3f7f905e
parentc5c5c989ec1ca8e059095965a25242867e121c52 (diff)
parent78379073350ef9cf99fe313e3392d19ae6c9744d (diff)
downloadopengl-registry-3d5186ca35d8d14f17174630eb23e35c7352f67b.zip
opengl-registry-3d5186ca35d8d14f17174630eb23e35c7352f67b.tar.xz
Merge pull request #82 from imirkin/master
Fix suffix for glMultiDrawElementsBaseVertex
-rw-r--r--api/GL/glext.h2
-rwxr-xr-xapi/GL/glxext.h2
-rwxr-xr-xapi/GL/wglext.h2
-rw-r--r--api/GLES/gl.h2
-rw-r--r--api/GLES/glext.h2
-rw-r--r--api/GLES2/gl2.h2
-rw-r--r--api/GLES2/gl2ext.h8
-rw-r--r--api/GLES3/gl3.h2
-rw-r--r--xml/gl.xml12
9 files changed, 11 insertions, 23 deletions
diff --git a/api/GL/glext.h b/api/GL/glext.h
index 894eabd..630bc4d 100644
--- a/api/GL/glext.h
+++ b/api/GL/glext.h
@@ -51,7 +51,7 @@ extern "C" {
#define GLAPI extern
#endif
-#define GL_GLEXT_VERSION 20170628
+#define GL_GLEXT_VERSION 20170726
/* Generated C header for:
* API: gl
diff --git a/api/GL/glxext.h b/api/GL/glxext.h
index e08fc33..99845c0 100755
--- a/api/GL/glxext.h
+++ b/api/GL/glxext.h
@@ -34,7 +34,7 @@ extern "C" {
** https://github.com/KhronosGroup/OpenGL-Registry
*/
-#define GLX_GLXEXT_VERSION 20170628
+#define GLX_GLXEXT_VERSION 20170726
/* Generated C header for:
* API: glx
diff --git a/api/GL/wglext.h b/api/GL/wglext.h
index ae53426..ac258d1 100755
--- a/api/GL/wglext.h
+++ b/api/GL/wglext.h
@@ -39,7 +39,7 @@ extern "C" {
#include <windows.h>
#endif
-#define WGL_WGLEXT_VERSION 20170628
+#define WGL_WGLEXT_VERSION 20170726
/* Generated C header for:
* API: wgl
diff --git a/api/GLES/gl.h b/api/GLES/gl.h
index ee177c5..71a302e 100644
--- a/api/GLES/gl.h
+++ b/api/GLES/gl.h
@@ -36,7 +36,7 @@ extern "C" {
#include <GLES/glplatform.h>
-/* Generated on date 20170628 */
+/* Generated on date 20170726 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES/glext.h b/api/GLES/glext.h
index 9495649..92e12bd 100644
--- a/api/GLES/glext.h
+++ b/api/GLES/glext.h
@@ -38,7 +38,7 @@ extern "C" {
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20170628 */
+/* Generated on date 20170726 */
/* Generated C header for:
* API: gles1
diff --git a/api/GLES2/gl2.h b/api/GLES2/gl2.h
index 98e1ffb..d5ca1af 100644
--- a/api/GLES2/gl2.h
+++ b/api/GLES2/gl2.h
@@ -44,7 +44,7 @@ extern "C" {
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20170628 */
+/* Generated on date 20170726 */
/* Generated C header for:
* API: gles2
diff --git a/api/GLES2/gl2ext.h b/api/GLES2/gl2ext.h
index 2826a49..f996f5e 100644
--- a/api/GLES2/gl2ext.h
+++ b/api/GLES2/gl2ext.h
@@ -38,7 +38,7 @@ extern "C" {
#define GL_APIENTRYP GL_APIENTRY*
#endif
-/* Generated on date 20170628 */
+/* Generated on date 20170726 */
/* Generated C header for:
* API: gles2
@@ -324,12 +324,12 @@ GL_APICALL GLboolean GL_APIENTRY glIsEnablediOES (GLenum target, GLuint index);
typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXOESPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
typedef void (GL_APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXOESPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXOESPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
-typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXOESPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
+typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
#ifdef GL_GLEXT_PROTOTYPES
GL_APICALL void GL_APIENTRY glDrawElementsBaseVertexOES (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
GL_APICALL void GL_APIENTRY glDrawRangeElementsBaseVertexOES (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
GL_APICALL void GL_APIENTRY glDrawElementsInstancedBaseVertexOES (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
-GL_APICALL void GL_APIENTRY glMultiDrawElementsBaseVertexOES (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
+GL_APICALL void GL_APIENTRY glMultiDrawElementsBaseVertexEXT (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
#endif
#endif /* GL_OES_draw_elements_base_vertex */
@@ -1311,12 +1311,10 @@ GL_APICALL GLboolean GL_APIENTRY glIsEnablediEXT (GLenum target, GLuint index);
typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
typedef void (GL_APIENTRYP PFNGLDRAWRANGEELEMENTSBASEVERTEXEXTPROC) (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
typedef void (GL_APIENTRYP PFNGLDRAWELEMENTSINSTANCEDBASEVERTEXEXTPROC) (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
-typedef void (GL_APIENTRYP PFNGLMULTIDRAWELEMENTSBASEVERTEXEXTPROC) (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
#ifdef GL_GLEXT_PROTOTYPES
GL_APICALL void GL_APIENTRY glDrawElementsBaseVertexEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLint basevertex);
GL_APICALL void GL_APIENTRY glDrawRangeElementsBaseVertexEXT (GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const void *indices, GLint basevertex);
GL_APICALL void GL_APIENTRY glDrawElementsInstancedBaseVertexEXT (GLenum mode, GLsizei count, GLenum type, const void *indices, GLsizei instancecount, GLint basevertex);
-GL_APICALL void GL_APIENTRY glMultiDrawElementsBaseVertexEXT (GLenum mode, const GLsizei *count, GLenum type, const void *const*indices, GLsizei primcount, const GLint *basevertex);
#endif
#endif /* GL_EXT_draw_elements_base_vertex */
diff --git a/api/GLES3/gl3.h b/api/GLES3/gl3.h
index f10c69b..135645a 100644
--- a/api/GLES3/gl3.h
+++ b/api/GLES3/gl3.h
@@ -44,7 +44,7 @@ extern "C" {
#define GL_GLES_PROTOTYPES 1
#endif
-/* Generated on date 20170628 */
+/* Generated on date 20170726 */
/* Generated C header for:
* API: gles2
diff --git a/xml/gl.xml b/xml/gl.xml
index 5a199ea..251f758 100644
--- a/xml/gl.xml
+++ b/xml/gl.xml
@@ -19500,16 +19500,6 @@ typedef unsigned int GLhandleARB;
<alias name="glMultiDrawElementsBaseVertex"/>
</command>
<command>
- <proto>void <name>glMultiDrawElementsBaseVertexOES</name></proto>
- <param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
- <param len="COMPSIZE(drawcount)">const <ptype>GLsizei</ptype> *<name>count</name></param>
- <param group="DrawElementsType"><ptype>GLenum</ptype> <name>type</name></param>
- <param len="COMPSIZE(drawcount)">const void *const*<name>indices</name></param>
- <param><ptype>GLsizei</ptype> <name>primcount</name></param>
- <param len="COMPSIZE(drawcount)">const <ptype>GLint</ptype> *<name>basevertex</name></param>
- <alias name="glMultiDrawElementsBaseVertex"/>
- </command>
- <command>
<proto>void <name>glMultiDrawElementsEXT</name></proto>
<param group="PrimitiveType"><ptype>GLenum</ptype> <name>mode</name></param>
<param len="COMPSIZE(primcount)">const <ptype>GLsizei</ptype> *<name>count</name></param>
@@ -46370,7 +46360,7 @@ typedef unsigned int GLhandleARB;
<command name="glDrawElementsBaseVertexOES"/>
<command name="glDrawRangeElementsBaseVertexOES" comment="Supported only if OpenGL ES 3.0 is supported"/>
<command name="glDrawElementsInstancedBaseVertexOES" comment="Supported only if OpenGL ES 3.0 is supported"/>
- <command name="glMultiDrawElementsBaseVertexOES" comment="Supported only if GL_EXT_multi_draw_arrays is supported"/>
+ <command name="glMultiDrawElementsBaseVertexEXT" comment="Supported only if GL_EXT_multi_draw_arrays is supported"/>
</require>
</extension>
<extension name="GL_OES_draw_texture" supported="gles1">