Skip to content

Commit

Permalink
Fix suffix for glMultiDrawElementsBaseVertex
Browse files Browse the repository at this point in the history 
The OES_draw_elements_base_vertex spec specifies that the
glMultiDrawElementsBaseVertexEXT function be made available if
EXT_multi_draw_arrays is available. However the gl.xml (and generated
headers) used an OES suffix there by mistake.

Fixes #81
  • Loading branch information
@imirkin
imirkin committed Jul 27, 2017
1 parent c5c5c98 commit 7837907
Show file tree
Hide file tree
Showing 9 changed files with 11 additions and 23 deletions.
2 changes: 1 addition & 1 deletion api/GL/glext.h
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/GL/glxext.h
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/GL/wglext.h
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/GLES/gl.h
View file
Expand Up @@ -36,7 +36,7 @@ extern "C" {

#include <GLES/glplatform.h>

/* Generated on date 20170628 */
/* Generated on date 20170726 */

/* Generated C header for:
* API: gles1
Expand Down
2 changes: 1 addition & 1 deletion api/GLES/glext.h
View file
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion api/GLES2/gl2.h
View file
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions api/GLES2/gl2ext.h
View file
Expand Up @@ -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
Expand Down Expand Up @@ -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 */

Expand Down Expand Up @@ -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 */

Expand Down
2 changes: 1 addition & 1 deletion api/GLES3/gl3.h
View file
Expand Up @@ -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
Expand Down
12 changes: 1 addition & 11 deletions xml/gl.xml
View file
Expand Up @@ -19499,16 +19499,6 @@ typedef unsigned int GLhandleARB;
<param len="COMPSIZE(drawcount)">const <ptype>GLint</ptype> *<name>basevertex</name></param>
<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>
Expand Down Expand Up @@ -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">
Expand Down

0 comments on commit 7837907

Please sign in to comment.