Complete/tweak the specs for GL 4.0-4.2.

Untested with actual GL 4.x apps, but hopefully better support than before.

diff --git a/glapi.py b/glapi.py
index 62e4638e8635a273953523b645c743acf590f5a8..a3a0b58d9487f2ab6a184f7d4e421437db6ca773 100644 (file)
--- a/glapi.py
+++ b/glapi.py
@@ -664,7 +664,7 @@ glapi.add_functions([
     GlFunction(Void, "glEnablei", [(GLenum, "target"), (GLuint, "index")]),
     GlFunction(Void, "glDisablei", [(GLenum, "target"), (GLuint, "index")]),
     GlFunction(GLboolean, "glIsEnabledi", [(GLenum, "target"), (GLuint, "index")], sideeffects=False),
-    GlFunction(Void, "glBeginTransformFeedback", [(GLenum, "primitiveMode")]),
+    GlFunction(Void, "glBeginTransformFeedback", [(GLenum_mode, "primitiveMode")]),
     GlFunction(Void, "glEndTransformFeedback", []),
     GlFunction(Void, "glBindBufferRange", [(GLenum, "target"), (GLuint, "index"), (GLbuffer, "buffer"), (GLintptr, "offset"), (GLsizeiptr, "size")]),
     GlFunction(Void, "glBindBufferBase", [(GLenum, "target"), (GLuint, "index"), (GLbuffer, "buffer")]),
@@ -1177,17 +1177,17 @@ glapi.add_functions([
     GlFunction(Void, "glPatchParameterfv", [(GLenum, "pname"), (Const(Array(GLfloat, "__gl_param_size(pname)")), "values")]),
 
     # GL_ARB_transform_feedback2
-    GlFunction(Void, "glBindTransformFeedback", [(GLenum, "target"), (GLuint, "id")]),
-    GlFunction(Void, "glDeleteTransformFeedbacks", [(GLsizei, "n"), (Const(Array(GLuint, "n")), "ids")]),
-    GlFunction(Void, "glGenTransformFeedbacks", [(GLsizei, "n"), Out(Array(GLuint, "n"), "ids")]),
-    GlFunction(GLboolean, "glIsTransformFeedback", [(GLuint, "id")], sideeffects=False),
+    GlFunction(Void, "glBindTransformFeedback", [(GLenum, "target"), (GLfeedback, "id")]),
+    GlFunction(Void, "glDeleteTransformFeedbacks", [(GLsizei, "n"), (Const(Array(GLfeedback, "n")), "ids")]),
+    GlFunction(Void, "glGenTransformFeedbacks", [(GLsizei, "n"), Out(Array(GLfeedback, "n"), "ids")]),
+    GlFunction(GLboolean, "glIsTransformFeedback", [(GLfeedback, "id")], sideeffects=False),
     GlFunction(Void, "glPauseTransformFeedback", []),
     GlFunction(Void, "glResumeTransformFeedback", []),
-    GlFunction(Void, "glDrawTransformFeedback", [(GLenum, "mode"), (GLuint, "id")]),
+    GlFunction(Void, "glDrawTransformFeedback", [(GLenum_mode, "mode"), (GLfeedback, "id")]),
 
     # GL_ARB_transform_feedback3
-    GlFunction(Void, "glDrawTransformFeedbackStream", [(GLenum, "mode"), (GLuint, "id"), (GLuint, "stream")]),
-    GlFunction(Void, "glBeginQueryIndexed", [(GLenum, "target"), (GLuint, "index"), (GLuint, "id")]),
+    GlFunction(Void, "glDrawTransformFeedbackStream", [(GLenum_mode, "mode"), (GLfeedback, "id"), (GLuint, "stream")]),
+    GlFunction(Void, "glBeginQueryIndexed", [(GLenum, "target"), (GLuint, "index"), (GLfeedback, "id")]),
     GlFunction(Void, "glEndQueryIndexed", [(GLenum, "target"), (GLuint, "index")]),
     GlFunction(Void, "glGetQueryIndexediv", [(GLenum, "target"), (GLuint, "index"), (GLenum, "pname"), Out(OpaqueArray(GLint, "__glGetQueryIndexediv_size(pname)"), "params")], sideeffects=False),
 
@@ -1317,6 +1317,33 @@ glapi.add_functions([
     GlFunction(Void, "glGetnUniformuivARB", [(GLprogram, "program"), (GLlocation, "location"), (GLsizei, "bufSize"), Out(Array(GLuint, "bufSize"), "params")], sideeffects=False),
     GlFunction(Void, "glGetnUniformdvARB", [(GLprogram, "program"), (GLlocation, "location"), (GLsizei, "bufSize"), Out(Array(GLdouble, "bufSize"), "params")], sideeffects=False),
 
+    # GL_ARB_base_instance
+    GlFunction(Void, "glDrawArraysInstancedBaseInstance", [(GLenum_mode, "mode"), (GLint, "first"), (GLsizei, "count"), (GLsizei, "primcount"), (GLuint, "baseinstance")]),
+    GlFunction(Void, "glDrawElementsInstancedBaseInstance", [(GLenum_mode, "mode"), (GLsizei, "count"), (GLenum, "type"), (OpaquePointer(Const(GLvoid)), "indices"), (GLsizei, "primcount"), (GLuint, "baseinstance")]),
+    GlFunction(Void, "glDrawElementsInstancedBaseVertexBaseInstance", [(GLenum_mode, "mode"), (GLsizei, "count"), (GLenum, "type"), (OpaquePointer(Const(GLvoid)), "indices"), (GLsizei, "primcount"), (GLint, "basevertex"), (GLuint, "baseinstance")]),
+
+    # GL_ARB_transform_feedback_instanced
+    GlFunction(Void, "glDrawTransformFeedbackInstanced", [(GLenum_mode, "mode"), (GLfeedback, "id"), (GLsizei, "primcount")]),
+    GlFunction(Void, "glDrawTransformFeedbackStreamInstanced", [(GLenum_mode, "mode"), (GLfeedback, "id"), (GLuint, "stream"), (GLsizei, "primcount")]),
+
+    # GL_ARB_internalformat_query
+    GlFunction(Void, "glGetInternalformativ", [(GLenum, "target"), (GLenum, "internalformat"), (GLenum, "pname"), (GLsizei, "bufSize"), Out(Array(GLint, "bufSize"), "params")], sideeffects=False),
+
+    # GL_ARB_shader_atomic_counters
+    GlFunction(Void, "glGetActiveAtomicCounterBufferiv", [(GLprogram, "program"), (GLuint, "bufferIndex"), (GLenum, "pname"), Out(OpaqueArray(GLint, "__glGetActiveAtomicCounterBufferiv_size(pname)"), "params")], sideeffects=False),
+
+    # GL_ARB_shader_image_load_store
+    GlFunction(Void, "glBindImageTexture", [(GLuint, "unit"), (GLtexture, "texture"), (GLint, "level"), (GLboolean, "layered"), (GLint, "layer"), (GLenum, "access"), (GLenum, "format")]),
+    GlFunction(Void, "glMemoryBarrier", [(GLbitfield_barrier, "barriers")]),
+
+    # GL_ARB_texture_storage
+    GlFunction(Void, "glTexStorage1D", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width")]),
+    GlFunction(Void, "glTexStorage2D", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
+    GlFunction(Void, "glTexStorage3D", [(GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth")]),
+    GlFunction(Void, "glTextureStorage1DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width")]),
+    GlFunction(Void, "glTextureStorage2DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height")]),
+    GlFunction(Void, "glTextureStorage3DEXT", [(GLtexture, "texture"), (GLenum, "target"), (GLsizei, "levels"), (GLenum, "internalformat"), (GLsizei, "width"), (GLsizei, "height"), (GLsizei, "depth")]),
+
     # GL_EXT_blend_color
     GlFunction(Void, "glBlendColorEXT", [(GLclampf, "red"), (GLclampf, "green"), (GLclampf, "blue"), (GLclampf, "alpha")]),
 
@@ -1992,11 +2019,11 @@ glapi.add_functions([
 
     # GL_ATI_element_array
     GlFunction(Void, "glElementPointerATI", [(GLenum, "type"), (Const(OpaquePointer(GLvoid)), "pointer")]),
-    GlFunction(Void, "glDrawElementArrayATI", [(GLenum, "mode"), (GLsizei, "count")]),
-    GlFunction(Void, "glDrawRangeElementArrayATI", [(GLenum, "mode"), (GLuint, "start"), (GLuint, "end"), (GLsizei, "count")]),
+    GlFunction(Void, "glDrawElementArrayATI", [(GLenum_mode, "mode"), (GLsizei, "count")]),
+    GlFunction(Void, "glDrawRangeElementArrayATI", [(GLenum_mode, "mode"), (GLuint, "start"), (GLuint, "end"), (GLsizei, "count")]),
 
     # GL_SUN_mesh_array
-    GlFunction(Void, "glDrawMeshArraysSUN", [(GLenum, "mode"), (GLint, "first"), (GLsizei, "count"), (GLsizei, "width")]),
+    GlFunction(Void, "glDrawMeshArraysSUN", [(GLenum_mode, "mode"), (GLint, "first"), (GLsizei, "count"), (GLsizei, "width")]),
 
     # GL_NV_occlusion_query
     GlFunction(Void, "glGenOcclusionQueriesNV", [(GLsizei, "n"), Out(Array(GLquery, "n"), "ids")]),
@@ -2016,10 +2043,10 @@ glapi.add_functions([
 
     # GL_APPLE_element_array
     GlFunction(Void, "glElementPointerAPPLE", [(GLenum, "type"), (Const(Blob(GLvoid, "type")), "pointer")]),
-    GlFunction(Void, "glDrawElementArrayAPPLE", [(GLenum, "mode"), (GLint, "first"), (GLsizei, "count")]),
-    GlFunction(Void, "glDrawRangeElementArrayAPPLE", [(GLenum, "mode"), (GLuint, "start"), (GLuint, "end"), (GLint, "first"), (GLsizei, "count")]),
-    GlFunction(Void, "glMultiDrawElementArrayAPPLE", [(GLenum, "mode"), (Const(Array(GLint, "primcount")), "first"), (Const(Array(GLsizei, "primcount")), "count"), (GLsizei, "primcount")]),
-    GlFunction(Void, "glMultiDrawRangeElementArrayAPPLE", [(GLenum, "mode"), (GLuint, "start"), (GLuint, "end"), (Const(Array(GLint, "primcount")), "first"), (Const(Array(GLsizei, "primcount")), "count"), (GLsizei, "primcount")]),
+    GlFunction(Void, "glDrawElementArrayAPPLE", [(GLenum_mode, "mode"), (GLint, "first"), (GLsizei, "count")]),
+    GlFunction(Void, "glDrawRangeElementArrayAPPLE", [(GLenum_mode, "mode"), (GLuint, "start"), (GLuint, "end"), (GLint, "first"), (GLsizei, "count")]),
+    GlFunction(Void, "glMultiDrawElementArrayAPPLE", [(GLenum_mode, "mode"), (Const(Array(GLint, "primcount")), "first"), (Const(Array(GLsizei, "primcount")), "count"), (GLsizei, "primcount")]),
+    GlFunction(Void, "glMultiDrawRangeElementArrayAPPLE", [(GLenum_mode, "mode"), (GLuint, "start"), (GLuint, "end"), (Const(Array(GLint, "primcount")), "first"), (Const(Array(GLsizei, "primcount")), "count"), (GLsizei, "primcount")]),
 
     # GL_APPLE_fence
     GlFunction(Void, "glGenFencesAPPLE", [(GLsizei, "n"), Out(Array(GLuint, "n"), "fences")]),
@@ -2270,7 +2297,7 @@ glapi.add_functions([
     GlFunction(GLboolean, "glIsEnabledIndexedEXT", [(GLenum, "target"), (GLuint, "index")], sideeffects=False),
 
     # GL_NV_transform_feedback
-    GlFunction(Void, "glBeginTransformFeedbackNV", [(GLenum, "primitiveMode")]),
+    GlFunction(Void, "glBeginTransformFeedbackNV", [(GLenum_mode, "primitiveMode")]),
     GlFunction(Void, "glEndTransformFeedbackNV", []),
     GlFunction(Void, "glTransformFeedbackAttribsNV", [(GLuint, "count"), (Const(OpaqueArray(GLint, "__glTransformFeedbackAttribsNV_size(count)")), "attribs"), (GLenum, "bufferMode")]),
     GlFunction(Void, "glBindBufferRangeNV", [(GLenum, "target"), (GLuint, "index"), (GLbuffer, "buffer"), (GLintptr, "offset"), (GLsizeiptr, "size")]),
@@ -2312,7 +2339,7 @@ glapi.add_functions([
     GlFunction(Void, "glGetVideoui64vNV", [(GLuint, "video_slot"), (GLenum, "pname"), Out(OpaqueArray(GLuint64EXT, "__glGetVideoui64vNV_size(pname)"), "params")], sideeffects=False),
 
     # GL_EXT_transform_feedback
-    GlFunction(Void, "glBeginTransformFeedbackEXT", [(GLenum, "primitiveMode")]),
+    GlFunction(Void, "glBeginTransformFeedbackEXT", [(GLenum_mode, "primitiveMode")]),
     GlFunction(Void, "glEndTransformFeedbackEXT", []),
     GlFunction(Void, "glBindBufferRangeEXT", [(GLenum, "target"), (GLuint, "index"), (GLbuffer, "buffer"), (GLintptr, "offset"), (GLsizeiptr, "size")]),
     GlFunction(Void, "glBindBufferOffsetEXT", [(GLenum, "target"), (GLuint, "index"), (GLbuffer, "buffer"), (GLintptr, "offset")]),
@@ -2527,25 +2554,25 @@ glapi.add_functions([
     GlFunction(Void, "glProgramUniformMatrix3x4dvEXT", [(GLprogram, "program"), (GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count*3*4")), "value")]),
     GlFunction(Void, "glProgramUniformMatrix4x2dvEXT", [(GLprogram, "program"), (GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count*4*2")), "value")]),
     GlFunction(Void, "glProgramUniformMatrix4x3dvEXT", [(GLprogram, "program"), (GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count*4*3")), "value")]),
-    Function(Void, "glVertexArrayVertexOffsetEXT", [(GLuint, "vaobj"), (GLuint, "buffer"), (GLint, "size"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
-    Function(Void, "glVertexArrayColorOffsetEXT", [(GLuint, "vaobj"), (GLuint, "buffer"), (GLint, "size"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
-    Function(Void, "glVertexArrayEdgeFlagOffsetEXT", [(GLuint, "vaobj"), (GLuint, "buffer"), (GLsizei, "stride"), (GLintptr, "offset")]),
-    Function(Void, "glVertexArrayIndexOffsetEXT", [(GLuint, "vaobj"), (GLuint, "buffer"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
-    Function(Void, "glVertexArrayNormalOffsetEXT", [(GLuint, "vaobj"), (GLuint, "buffer"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
-    Function(Void, "glVertexArrayTexCoordOffsetEXT", [(GLuint, "vaobj"), (GLuint, "buffer"), (GLint, "size"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
-    Function(Void, "glVertexArrayMultiTexCoordOffsetEXT", [(GLuint, "vaobj"), (GLuint, "buffer"), (GLenum, "texunit"), (GLint, "size"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
-    Function(Void, "glVertexArrayFogCoordOffsetEXT", [(GLuint, "vaobj"), (GLuint, "buffer"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
-    Function(Void, "glVertexArraySecondaryColorOffsetEXT", [(GLuint, "vaobj"), (GLuint, "buffer"), (GLint, "size"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
-    Function(Void, "glVertexArrayVertexAttribOffsetEXT", [(GLuint, "vaobj"), (GLuint, "buffer"), (GLuint, "index"), (GLint, "size"), (GLenum, "type"), (GLboolean, "normalized"), (GLsizei, "stride"), (GLintptr, "offset")]),
-    Function(Void, "glVertexArrayVertexAttribIOffsetEXT", [(GLuint, "vaobj"), (GLuint, "buffer"), (GLuint, "index"), (GLint, "size"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
-    Function(Void, "glEnableVertexArrayEXT", [(GLuint, "vaobj"), (GLenum, "array")]),
-    Function(Void, "glDisableVertexArrayEXT", [(GLuint, "vaobj"), (GLenum, "array")]),
-    Function(Void, "glEnableVertexArrayAttribEXT", [(GLuint, "vaobj"), (GLuint, "index")]),
-    Function(Void, "glDisableVertexArrayAttribEXT", [(GLuint, "vaobj"), (GLuint, "index")]),
-    Function(Void, "glGetVertexArrayIntegervEXT", [(GLuint, "vaobj"), (GLenum, "pname"), Out(Pointer(GLint), "param")]),
-    Function(Void, "glGetVertexArrayPointervEXT", [(GLuint, "vaobj"), (GLenum, "pname"), Out(Pointer(OpaquePointer(GLvoid)), "param")]),
-    Function(Void, "glGetVertexArrayIntegeri_vEXT", [(GLuint, "vaobj"), (GLuint, "index"), (GLenum, "pname"), Out(Pointer(GLint), "param")]),
-    Function(Void, "glGetVertexArrayPointeri_vEXT", [(GLuint, "vaobj"), (GLuint, "index"), (GLenum, "pname"), Out(Pointer(OpaquePointer(GLvoid)), "param")]),
+    GlFunction(Void, "glVertexArrayVertexOffsetEXT", [(GLarray, "vaobj"), (GLuint, "buffer"), (GLint, "size"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
+    GlFunction(Void, "glVertexArrayColorOffsetEXT", [(GLarray, "vaobj"), (GLuint, "buffer"), (GLint, "size"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
+    GlFunction(Void, "glVertexArrayEdgeFlagOffsetEXT", [(GLarray, "vaobj"), (GLuint, "buffer"), (GLsizei, "stride"), (GLintptr, "offset")]),
+    GlFunction(Void, "glVertexArrayIndexOffsetEXT", [(GLarray, "vaobj"), (GLuint, "buffer"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
+    GlFunction(Void, "glVertexArrayNormalOffsetEXT", [(GLarray, "vaobj"), (GLuint, "buffer"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
+    GlFunction(Void, "glVertexArrayTexCoordOffsetEXT", [(GLarray, "vaobj"), (GLuint, "buffer"), (GLint, "size"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
+    GlFunction(Void, "glVertexArrayMultiTexCoordOffsetEXT", [(GLarray, "vaobj"), (GLuint, "buffer"), (GLenum, "texunit"), (GLint, "size"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
+    GlFunction(Void, "glVertexArrayFogCoordOffsetEXT", [(GLarray, "vaobj"), (GLuint, "buffer"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
+    GlFunction(Void, "glVertexArraySecondaryColorOffsetEXT", [(GLarray, "vaobj"), (GLuint, "buffer"), (GLint, "size"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
+    GlFunction(Void, "glVertexArrayVertexAttribOffsetEXT", [(GLarray, "vaobj"), (GLuint, "buffer"), (GLuint, "index"), (GLint, "size"), (GLenum, "type"), (GLboolean, "normalized"), (GLsizei, "stride"), (GLintptr, "offset")]),
+    GlFunction(Void, "glVertexArrayVertexAttribIOffsetEXT", [(GLarray, "vaobj"), (GLuint, "buffer"), (GLuint, "index"), (GLint, "size"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
+    GlFunction(Void, "glEnableVertexArrayEXT", [(GLarray, "vaobj"), (GLenum, "array")]),
+    GlFunction(Void, "glDisableVertexArrayEXT", [(GLarray, "vaobj"), (GLenum, "array")]),
+    GlFunction(Void, "glEnableVertexArrayAttribEXT", [(GLarray, "vaobj"), (GLuint, "index")]),
+    GlFunction(Void, "glDisableVertexArrayAttribEXT", [(GLarray, "vaobj"), (GLuint, "index")]),
+    GlFunction(Void, "glGetVertexArrayIntegervEXT", [(GLarray, "vaobj"), (GLenum, "pname"), Out(Pointer(GLint), "param")]),
+    GlFunction(Void, "glGetVertexArrayPointervEXT", [(GLarray, "vaobj"), (GLenum, "pname"), Out(Pointer(OpaquePointer(GLvoid)), "param")]),
+    GlFunction(Void, "glGetVertexArrayIntegeri_vEXT", [(GLarray, "vaobj"), (GLuint, "index"), (GLenum, "pname"), Out(Pointer(GLint), "param")]),
+    GlFunction(Void, "glGetVertexArrayPointeri_vEXT", [(GLarray, "vaobj"), (GLuint, "index"), (GLenum, "pname"), Out(Pointer(OpaquePointer(GLvoid)), "param")]),
 
     # GL_NV_explicit_multisample
     GlFunction(Void, "glGetMultisamplefvNV", [(GLenum, "pname"), (GLuint, "index"), Out(Array(GLfloat, "2"), "val")], sideeffects=False),
@@ -2553,13 +2580,13 @@ glapi.add_functions([
     GlFunction(Void, "glTexRenderbufferNV", [(GLenum, "target"), (GLuint, "renderbuffer")]),
 
     # GL_NV_transform_feedback2
-    GlFunction(Void, "glBindTransformFeedbackNV", [(GLenum, "target"), (GLuint, "id")]),
-    GlFunction(Void, "glDeleteTransformFeedbacksNV", [(GLsizei, "n"), (Const(Array(GLuint, "n")), "ids")]),
-    GlFunction(Void, "glGenTransformFeedbacksNV", [(GLsizei, "n"), Out(Array(GLuint, "n"), "ids")]),
-    GlFunction(GLboolean, "glIsTransformFeedbackNV", [(GLuint, "id")], sideeffects=False),
+    GlFunction(Void, "glBindTransformFeedbackNV", [(GLenum, "target"), (GLfeedback, "id")]),
+    GlFunction(Void, "glDeleteTransformFeedbacksNV", [(GLsizei, "n"), (Const(Array(GLfeedback, "n")), "ids")]),
+    GlFunction(Void, "glGenTransformFeedbacksNV", [(GLsizei, "n"), Out(Array(GLfeedback, "n"), "ids")]),
+    GlFunction(GLboolean, "glIsTransformFeedbackNV", [(GLfeedback, "id")], sideeffects=False),
     GlFunction(Void, "glPauseTransformFeedbackNV", []),
     GlFunction(Void, "glResumeTransformFeedbackNV", []),
-    GlFunction(Void, "glDrawTransformFeedbackNV", [(GLenum, "mode"), (GLuint, "id")]),
+    GlFunction(Void, "glDrawTransformFeedbackNV", [(GLenum_mode, "mode"), (GLfeedback, "id")]),
 
     # GL_AMD_performance_monitor
     GlFunction(Void, "glGetPerfMonitorGroupsAMD", [Out(Pointer(GLint), "numGroups"), (GLsizei, "groupsSize"), Out(Array(GLuint, "groupsSize"), "groups")], sideeffects=False),
@@ -2661,8 +2688,8 @@ glapi.add_functions([
     GlFunction(Void, "glTextureBarrierNV", []),
 
     # GL_EXT_shader_image_load_store
-    GlFunction(Void, "glBindImageTextureEXT", [(GLuint, "index"), (GLuint, "texture"), (GLint, "level"), (GLboolean, "layered"), (GLint, "layer"), (GLenum, "access"), (GLint, "format")]),
-    GlFunction(Void, "glMemoryBarrierEXT", [(GLbitfield, "barriers")]),
+    GlFunction(Void, "glBindImageTextureEXT", [(GLuint, "index"), (GLtexture, "texture"), (GLint, "level"), (GLboolean, "layered"), (GLint, "layer"), (GLenum, "access"), (GLint, "format")]),
+    GlFunction(Void, "glMemoryBarrierEXT", [(GLbitfield_barrier, "barriers")]),
 
     # GL_EXT_vertex_attrib_64bit
     GlFunction(Void, "glVertexAttribL1dEXT", [(GLuint, "index"), (GLdouble, "x")]),
@@ -2675,7 +2702,7 @@ glapi.add_functions([
     GlFunction(Void, "glVertexAttribL4dvEXT", [(GLuint, "index"), (Const(Array(GLdouble, "4")), "v")]),
     GlFunction(Void, "glVertexAttribLPointerEXT", [(GLuint, "index"), (GLint, "size"), (GLenum, "type"), (GLsizei, "stride"), (Const(Blob(GLvoid, "size")), "pointer")]),
     GlFunction(Void, "glGetVertexAttribLdvEXT", [(GLuint, "index"), (GLenum, "pname"), Out(OpaqueArray(GLdouble, "__glGetVertexAttribLdvEXT_size(pname)"), "params")], sideeffects=False),
-    GlFunction(Void, "glVertexArrayVertexAttribLOffsetEXT", [(GLuint, "vaobj"), (GLuint, "buffer"), (GLuint, "index"), (GLint, "size"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
+    GlFunction(Void, "glVertexArrayVertexAttribLOffsetEXT", [(GLarray, "vaobj"), (GLuint, "buffer"), (GLuint, "index"), (GLint, "size"), (GLenum, "type"), (GLsizei, "stride"), (GLintptr, "offset")]),
 
     # GL_NV_gpu_program5
     GlFunction(Void, "glProgramSubroutineParametersuivNV", [(GLenum, "target"), (GLsizei, "count"), (Const(Array(GLuint, "count")), "params")]),
@@ -2763,8 +2790,8 @@ glapi.add_functions([
     GlFunction(GLsync, "glImportSyncEXT", [(GLenum, "external_sync_type"), (GLintptr, "external_sync"), (GLbitfield, "flags")]),
 
     # GL_AMD_multi_draw_indirect
-    GlFunction(Void, "glMultiDrawArraysIndirectAMD", [(GLenum, "mode"), (Const(OpaquePointer(GLvoid)), "indirect"), (GLsizei, "primcount"), (GLsizei, "stride")]),
-    GlFunction(Void, "glMultiDrawElementsIndirectAMD", [(GLenum, "mode"), (GLenum, "type"), (Const(OpaquePointer(GLvoid)), "indirect"), (GLsizei, "primcount"), (GLsizei, "stride")]),
+    GlFunction(Void, "glMultiDrawArraysIndirectAMD", [(GLenum_mode, "mode"), (Const(OpaquePointer(GLvoid)), "indirect"), (GLsizei, "primcount"), (GLsizei, "stride")]),
+    GlFunction(Void, "glMultiDrawElementsIndirectAMD", [(GLenum_mode, "mode"), (GLenum, "type"), (Const(OpaquePointer(GLvoid)), "indirect"), (GLsizei, "primcount"), (GLsizei, "stride")]),
 
     # GL_KTX_buffer_region
     # XXX: http://www.west.net/~brittain/3dsmax2.htm does not mention EXT suffix
@@ -2781,7 +2808,7 @@ glapi.add_functions([
     GlFunction(GLuint, "glBufferRegionEnabledEXT", [], sideeffects=False),
 
     # GL_WIN_swap_hint
-    Function(Void, "glAddSwapHintRectWIN", [(GLint, "x"), (GLint, "y"), (GLsizei, "width"), (GLsizei, "height")]),
+    GlFunction(Void, "glAddSwapHintRectWIN", [(GLint, "x"), (GLint, "y"), (GLsizei, "width"), (GLsizei, "height")]),
 ])
 
 

diff --git a/glparams.py b/glparams.py
index fd8c002dd9c24d4c206de19f6d33035715a7441a..bc350a4f80c4b90c7020ec372a2e68b36b273458 100644 (file)
--- a/glparams.py
+++ b/glparams.py
@@ -285,7 +285,7 @@ parameters = [
     ("glGet",  F,      1,      "GL_DEPTH_BIAS"),       # 0x0D1F
     ("glGet",  I,      1,      "GL_MAX_EVAL_ORDER"),   # 0x0D30
     ("glGet",  I,      1,      "GL_MAX_LIGHTS"),       # 0x0D31
-    ("glGet",  I,      1,      "GL_MAX_CLIP_PLANES"),  # 0x0D32
+    ("glGet",  I,      1,      "GL_MAX_CLIP_DISTANCES"),       # 0x0D32
     ("glGet",  I,      1,      "GL_MAX_TEXTURE_SIZE"), # 0x0D33
     ("glGet",  I,      1,      "GL_MAX_PIXEL_MAP_TABLE"),      # 0x0D34
     ("glGet",  I,      1,      "GL_MAX_ATTRIB_STACK_DEPTH"),   # 0x0D35
@@ -497,14 +497,14 @@ parameters = [
     ("",       X,      1,      "GL_T2F_N3F_V3F"),      # 0x2A2B
     ("",       X,      1,      "GL_T2F_C4F_N3F_V3F"),  # 0x2A2C
     ("",       X,      1,      "GL_T4F_C4F_N3F_V4F"),  # 0x2A2D
-    ("glGet",  B,      1,      "GL_CLIP_PLANE0"),      # 0x3000
-    ("glGet",  B,      1,      "GL_CLIP_PLANE1"),      # 0x3001
-    ("glGet",  B,      1,      "GL_CLIP_PLANE2"),      # 0x3002
-    ("glGet",  B,      1,      "GL_CLIP_PLANE3"),      # 0x3003
-    ("glGet",  B,      1,      "GL_CLIP_PLANE4"),      # 0x3004
-    ("glGet",  B,      1,      "GL_CLIP_PLANE5"),      # 0x3005
-    ("",       X,      1,      "GL_CLIP_DISTANCE6"),   # 0x3006
-    ("",       X,      1,      "GL_CLIP_DISTANCE7"),   # 0x3007
+    ("glGet",  B,      1,      "GL_CLIP_DISTANCE0"),   # 0x3000
+    ("glGet",  B,      1,      "GL_CLIP_DISTANCE1"),   # 0x3001
+    ("glGet",  B,      1,      "GL_CLIP_DISTANCE2"),   # 0x3002
+    ("glGet",  B,      1,      "GL_CLIP_DISTANCE3"),   # 0x3003
+    ("glGet",  B,      1,      "GL_CLIP_DISTANCE4"),   # 0x3004
+    ("glGet",  B,      1,      "GL_CLIP_DISTANCE5"),   # 0x3005
+    ("glGet",  B,      1,      "GL_CLIP_DISTANCE6"),   # 0x3006
+    ("glGet",  B,      1,      "GL_CLIP_DISTANCE7"),   # 0x3007
     ("_glGet", B,      1,      "GL_LIGHT0"),   # 0x4000
     ("_glGet", B,      1,      "GL_LIGHT1"),   # 0x4001
     ("_glGet", B,      1,      "GL_LIGHT2"),   # 0x4002
@@ -1384,7 +1384,7 @@ parameters = [
     ("",       X,      1,      "GL_MATRIX7_NV"),       # 0x8637
     ("glGet",  I,      1,      "GL_CURRENT_MATRIX_STACK_DEPTH_ARB"),   # 0x8640
     ("glGet",  F,      16,     "GL_CURRENT_MATRIX_ARB"),       # 0x8641
-    ("glGet",  B,      1,      "GL_VERTEX_PROGRAM_POINT_SIZE"),        # 0x8642
+    ("glGet",  B,      1,      "GL_PROGRAM_POINT_SIZE"),       # 0x8642
     ("glGet",  B,      1,      "GL_VERTEX_PROGRAM_TWO_SIDE"),  # 0x8643
     ("",       X,      1,      "GL_PROGRAM_PARAMETER_NV"),     # 0x8644
     ("glGetVertexAttrib",      P,      1,      "GL_VERTEX_ATTRIB_ARRAY_POINTER"),      # 0x8645
@@ -1825,7 +1825,7 @@ parameters = [
     ("glGetTexParameter",      E,      1,      "GL_DEPTH_TEXTURE_MODE"),       # 0x884B
     ("glGetTexParameter",      E,      1,      "GL_TEXTURE_COMPARE_MODE"),     # 0x884C
     ("glGetTexParameter",      E,      1,      "GL_TEXTURE_COMPARE_FUNC"),     # 0x884D
-    ("",       X,      1,      "GL_COMPARE_R_TO_TEXTURE"),     # 0x884E
+    ("",       X,      1,      "GL_COMPARE_REF_TO_TEXTURE"),   # 0x884E
     ("glGet",  B,      1,      "GL_TEXTURE_CUBE_MAP_SEAMLESS"),        # 0x884F
     ("",       X,      1,      "GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV"),  # 0x8850
     ("",       X,      1,      "GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV"),    # 0x8851
@@ -2118,6 +2118,12 @@ parameters = [
     ("",       X,      1,      "GL_RESAMPLE_ZERO_FILL_OML"),   # 0x8987
     ("",       X,      1,      "GL_RESAMPLE_AVERAGE_OML"),     # 0x8988
     ("",       X,      1,      "GL_RESAMPLE_DECIMATE_OML"),    # 0x8989
+    #("",      X,      1,      "GL_POINT_SIZE_ARRAY_TYPE_OES"),        # 0x898A
+    #("",      X,      1,      "GL_POINT_SIZE_ARRAY_STRIDE_OES"),      # 0x898B
+    #("",      X,      1,      "GL_POINT_SIZE_ARRAY_POINTER_OES"),     # 0x898C
+    #("",      X,      1,      "GL_MODELVIEW_MATRIX_FLOAT_AS_INT_BITS_OES"),   # 0x898D
+    #("",      X,      1,      "GL_PROJECTION_MATRIX_FLOAT_AS_INT_BITS_OES"),  # 0x898E
+    #("",      X,      1,      "GL_TEXTURE_MATRIX_FLOAT_AS_INT_BITS_OES"),     # 0x898F
     ("",       X,      1,      "GL_VERTEX_ATTRIB_MAP1_APPLE"), # 0x8A00
     ("",       X,      1,      "GL_VERTEX_ATTRIB_MAP2_APPLE"), # 0x8A01
     ("",       X,      1,      "GL_VERTEX_ATTRIB_MAP1_SIZE_APPLE"),    # 0x8A02
@@ -2232,8 +2238,30 @@ parameters = [
     ("",       X,      1,      "GL_FRAGMENT_SHADER_DERIVATIVE_HINT"),  # 0x8B8B
     ("",       X,      1,      "GL_SHADING_LANGUAGE_VERSION"), # 0x8B8C
     ("glGet",  I,      1,      "GL_CURRENT_PROGRAM"),  # 0x8B8D
+    #("",      X,      1,      "GL_PALETTE4_RGB8_OES"),        # 0x8B90
+    #("",      X,      1,      "GL_PALETTE4_RGBA8_OES"),       # 0x8B91
+    #("",      X,      1,      "GL_PALETTE4_R5_G6_B5_OES"),    # 0x8B92
+    #("",      X,      1,      "GL_PALETTE4_RGBA4_OES"),       # 0x8B93
+    #("",      X,      1,      "GL_PALETTE4_RGB5_A1_OES"),     # 0x8B94
+    #("",      X,      1,      "GL_PALETTE8_RGB8_OES"),        # 0x8B95
+    #("",      X,      1,      "GL_PALETTE8_RGBA8_OES"),       # 0x8B96
+    #("",      X,      1,      "GL_PALETTE8_R5_G6_B5_OES"),    # 0x8B97
+    #("",      X,      1,      "GL_PALETTE8_RGBA4_OES"),       # 0x8B98
+    #("",      X,      1,      "GL_PALETTE8_RGB5_A1_OES"),     # 0x8B99
     ("",       X,      1,      "GL_IMPLEMENTATION_COLOR_READ_TYPE"),   # 0x8B9A
     ("",       X,      1,      "GL_IMPLEMENTATION_COLOR_READ_FORMAT"), # 0x8B9B
+    #("",      X,      1,      "GL_POINT_SIZE_ARRAY_OES"),     # 0x8B9C
+    #("",      X,      1,      "GL_TEXTURE_CROP_RECT_OES"),    # 0x8B9D
+    #("",      X,      1,      "GL_MATRIX_INDEX_ARRAY_BUFFER_BINDING_OES"),    # 0x8B9E
+    #("",      X,      1,      "GL_POINT_SIZE_ARRAY_BUFFER_BINDING_OES"),      # 0x8B9F
+    #("",      X,      1,      "GL_FRAGMENT_PROGRAM_POSITION_MESA"),   # 0x8BB0
+    #("",      X,      1,      "GL_FRAGMENT_PROGRAM_CALLBACK_MESA"),   # 0x8BB1
+    #("",      X,      1,      "GL_FRAGMENT_PROGRAM_CALLBACK_FUNC_MESA"),      # 0x8BB2
+    #("",      X,      1,      "GL_FRAGMENT_PROGRAM_CALLBACK_DATA_MESA"),      # 0x8BB3
+    #("",      X,      1,      "GL_VERTEX_PROGRAM_CALLBACK_MESA"),     # 0x8BB4
+    #("",      X,      1,      "GL_VERTEX_PROGRAM_POSITION_MESA"),     # 0x8BB4
+    #("",      X,      1,      "GL_VERTEX_PROGRAM_CALLBACK_FUNC_MESA"),        # 0x8BB6
+    #("",      X,      1,      "GL_VERTEX_PROGRAM_CALLBACK_DATA_MESA"),        # 0x8BB7
     ("",       X,      1,      "GL_COUNTER_TYPE_AMD"), # 0x8BC0
     ("",       X,      1,      "GL_COUNTER_RANGE_AMD"),        # 0x8BC1
     ("",       X,      1,      "GL_UNSIGNED_INT64_AMD"),       # 0x8BC2
@@ -2241,6 +2269,28 @@ parameters = [
     ("",       X,      1,      "GL_PERFMON_RESULT_AVAILABLE_AMD"),     # 0x8BC4
     ("",       X,      1,      "GL_PERFMON_RESULT_SIZE_AMD"),  # 0x8BC5
     ("",       X,      1,      "GL_PERFMON_RESULT_AMD"),       # 0x8BC6
+    #("",      X,      1,      "GL_TEXTURE_WIDTH_QCOM"),       # 0x8BD2
+    #("",      X,      1,      "GL_TEXTURE_HEIGHT_QCOM"),      # 0x8BD3
+    #("",      X,      1,      "GL_TEXTURE_DEPTH_QCOM"),       # 0x8BD4
+    #("",      X,      1,      "GL_TEXTURE_INTERNAL_FORMAT_QCOM"),     # 0x8BD5
+    #("",      X,      1,      "GL_TEXTURE_FORMAT_QCOM"),      # 0x8BD6
+    #("",      X,      1,      "GL_TEXTURE_TYPE_QCOM"),        # 0x8BD7
+    #("",      X,      1,      "GL_TEXTURE_IMAGE_VALID_QCOM"), # 0x8BD8
+    #("",      X,      1,      "GL_TEXTURE_NUM_LEVELS_QCOM"),  # 0x8BD9
+    #("",      X,      1,      "GL_TEXTURE_TARGET_QCOM"),      # 0x8BDA
+    #("",      X,      1,      "GL_TEXTURE_OBJECT_VALID_QCOM"),        # 0x8BDB
+    #("",      X,      1,      "GL_STATE_RESTORE"),    # 0x8BDC
+    #("",      X,      1,      "GL_COMPRESSED_RGB_PVRTC_4BPPV1_IMG"),  # 0x8C00
+    #("",      X,      1,      "GL_COMPRESSED_RGB_PVRTC_2BPPV1_IMG"),  # 0x8C01
+    #("",      X,      1,      "GL_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG"), # 0x8C02
+    #("",      X,      1,      "GL_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG"), # 0x8C03
+    #("",      X,      1,      "GL_MODULATE_COLOR_IMG"),       # 0x8C04
+    #("",      X,      1,      "GL_RECIP_ADD_SIGNED_ALPHA_IMG"),       # 0x8C05
+    #("",      X,      1,      "GL_TEXTURE_ALPHA_MODULATE_IMG"),       # 0x8C06
+    #("",      X,      1,      "GL_FACTOR_ALPHA_MODULATE_IMG"),        # 0x8C07
+    #("",      X,      1,      "GL_FRAGMENT_ALPHA_MODULATE_IMG"),      # 0x8C08
+    #("",      X,      1,      "GL_ADD_BLEND_IMG"),    # 0x8C09
+    #("",      X,      1,      "GL_SGX_BINARY_IMG"),   # 0x8C0A
     ("",       X,      1,      "GL_TEXTURE_RED_TYPE"), # 0x8C10
     ("",       X,      1,      "GL_TEXTURE_GREEN_TYPE"),       # 0x8C11
     ("",       X,      1,      "GL_TEXTURE_BLUE_TYPE"),        # 0x8C12
@@ -2321,6 +2371,8 @@ parameters = [
     ("",       X,      1,      "GL_SEPARATE_ATTRIBS"), # 0x8C8D
     ("",       X,      1,      "GL_TRANSFORM_FEEDBACK_BUFFER"),        # 0x8C8E
     ("glGet",  I,      1,      "GL_TRANSFORM_FEEDBACK_BUFFER_BINDING"),        # 0x8C8F
+    #("",      X,      1,      "GL_ATC_RGB_AMD"),      # 0x8C92
+    #("",      X,      1,      "GL_ATC_RGBA_EXPLICIT_ALPHA_AMD"),      # 0x8C93
     ("glGet",  E,      1,      "GL_POINT_SPRITE_COORD_ORIGIN"),        # 0x8CA0
     ("",       X,      1,      "GL_LOWER_LEFT"),       # 0x8CA1
     ("",       X,      1,      "GL_UPPER_LEFT"),       # 0x8CA2
@@ -2384,6 +2436,14 @@ parameters = [
     ("glGetRenderbufferParameter",     I,      1,      "GL_RENDERBUFFER_STENCIL_SIZE"),        # 0x8D55
     ("",       X,      1,      "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE"),       # 0x8D56
     ("glGet",  I,      1,      "GL_MAX_SAMPLES"),      # 0x8D57
+    #("",      X,      1,      "GL_TEXTURE_GEN_STR_OES"),      # 0x8D60
+    #("",      X,      1,      "GL_HALF_FLOAT_OES"),   # 0x8D61
+    #("",      X,      1,      "GL_RGB565_OES"),       # 0x8D62
+    #("",      X,      1,      "GL_ETC1_RGB8_OES"),    # 0x8D64
+    #("",      X,      1,      "GL_TEXTURE_EXTERNAL_OES"),     # 0x8D65
+    #("",      X,      1,      "GL_SAMPLER_EXTERNAL_OES"),     # 0x8D66
+    #("",      X,      1,      "GL_TEXTURE_BINDING_EXTERNAL_OES"),     # 0x8D67
+    #("",      X,      1,      "GL_REQUIRED_TEXTURE_IMAGE_UNITS_OES"), # 0x8D68
     ("",       X,      1,      "GL_RGBA32UI"), # 0x8D70
     ("",       X,      1,      "GL_RGB32UI"),  # 0x8D71
     ("",       X,      1,      "GL_ALPHA32UI_EXT"),    # 0x8D72
@@ -2595,6 +2655,14 @@ parameters = [
     ("",       X,      1,      "GL_COMPRESSED_SRGB_ALPHA_BPTC_UNORM_ARB"),     # 0x8E8D
     ("",       X,      1,      "GL_COMPRESSED_RGB_BPTC_SIGNED_FLOAT_ARB"),     # 0x8E8E
     ("",       X,      1,      "GL_COMPRESSED_RGB_BPTC_UNSIGNED_FLOAT_ARB"),   # 0x8E8F
+    #("",      X,      1,      "GL_COVERAGE_COMPONENT_NV"),    # 0x8ED0
+    #("",      X,      1,      "GL_COVERAGE_COMPONENT4_NV"),   # 0x8ED1
+    #("",      X,      1,      "GL_COVERAGE_ATTACHMENT_NV"),   # 0x8ED2
+    #("",      X,      1,      "GL_COVERAGE_BUFFERS_NV"),      # 0x8ED3
+    #("",      X,      1,      "GL_COVERAGE_SAMPLES_NV"),      # 0x8ED4
+    #("",      X,      1,      "GL_COVERAGE_ALL_FRAGMENTS_NV"),        # 0x8ED5
+    #("",      X,      1,      "GL_COVERAGE_EDGE_FRAGMENTS_NV"),       # 0x8ED6
+    #("",      X,      1,      "GL_COVERAGE_AUTOMATIC_NV"),    # 0x8ED7
     ("",       X,      1,      "GL_BUFFER_GPU_ADDRESS_NV"),    # 0x8F1D
     ("",       X,      1,      "GL_VERTEX_ATTRIB_ARRAY_UNIFIED_NV"),   # 0x8F1E
     ("",       X,      1,      "GL_ELEMENT_ARRAY_UNIFIED_NV"), # 0x8F1F
@@ -2622,13 +2690,13 @@ parameters = [
     ("",       X,      1,      "GL_MAX_SHADER_BUFFER_ADDRESS_NV"),     # 0x8F35
     ("",       X,      1,      "GL_COPY_READ_BUFFER"), # 0x8F36
     ("",       X,      1,      "GL_COPY_WRITE_BUFFER"),        # 0x8F37
-    ("",       X,      1,      "GL_MAX_IMAGE_UNITS_EXT"),      # 0x8F38
-    ("",       X,      1,      "GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS_EXT"),        # 0x8F39
-    ("",       X,      1,      "GL_IMAGE_BINDING_NAME_EXT"),   # 0x8F3A
-    ("",       X,      1,      "GL_IMAGE_BINDING_LEVEL_EXT"),  # 0x8F3B
-    ("",       X,      1,      "GL_IMAGE_BINDING_LAYERED_EXT"),        # 0x8F3C
-    ("",       X,      1,      "GL_IMAGE_BINDING_LAYER_EXT"),  # 0x8F3D
-    ("",       X,      1,      "GL_IMAGE_BINDING_ACCESS_EXT"), # 0x8F3E
+    ("",       X,      1,      "GL_MAX_IMAGE_UNITS"),  # 0x8F38
+    ("",       X,      1,      "GL_MAX_COMBINED_IMAGE_UNITS_AND_FRAGMENT_OUTPUTS"),    # 0x8F39
+    ("",       X,      1,      "GL_IMAGE_BINDING_NAME"),       # 0x8F3A
+    ("",       X,      1,      "GL_IMAGE_BINDING_LEVEL"),      # 0x8F3B
+    ("",       X,      1,      "GL_IMAGE_BINDING_LAYERED"),    # 0x8F3C
+    ("",       X,      1,      "GL_IMAGE_BINDING_LAYER"),      # 0x8F3D
+    ("",       X,      1,      "GL_IMAGE_BINDING_ACCESS"),     # 0x8F3E
     ("",       X,      1,      "GL_DRAW_INDIRECT_BUFFER"),     # 0x8F3F
     ("",       X,      1,      "GL_DRAW_INDIRECT_UNIFIED_NV"), # 0x8F40
     ("",       X,      1,      "GL_DRAW_INDIRECT_ADDRESS_NV"), # 0x8F41
@@ -2645,6 +2713,7 @@ parameters = [
     ("",       X,      1,      "GL_DOUBLE_MAT3x4"),    # 0x8F4C
     ("",       X,      1,      "GL_DOUBLE_MAT4x2"),    # 0x8F4D
     ("",       X,      1,      "GL_DOUBLE_MAT4x3"),    # 0x8F4E
+    #("",      X,      1,      "GL_MALI_SHADER_BINARY_ARM"),   # 0x8F60
     ("",       X,      1,      "GL_RED_SNORM"),        # 0x8F90
     ("",       X,      1,      "GL_RG_SNORM"), # 0x8F91
     ("",       X,      1,      "GL_RGB_SNORM"),        # 0x8F92
@@ -2660,6 +2729,9 @@ parameters = [
     ("",       X,      1,      "GL_SIGNED_NORMALIZED"),        # 0x8F9C
     ("glGet",  B,      1,      "GL_PRIMITIVE_RESTART"),        # 0x8F9D
     ("glGet",  I,      1,      "GL_PRIMITIVE_RESTART_INDEX"),  # 0x8F9E
+    #("",      X,      1,      "GL_MAX_PROGRAM_TEXTURE_GATHER_COMPONENTS"),    # 0x8F9F
+    #("",      X,      1,      "GL_PERFMON_GLOBAL_MODE_QCOM"), # 0x8FA0
+    #("",      X,      1,      "GL_SHADER_BINARY_VIV"),        # 0x8FC4
     ("",       X,      1,      "GL_INT8_NV"),  # 0x8FE0
     ("",       X,      1,      "GL_INT8_VEC2_NV"),     # 0x8FE1
     ("",       X,      1,      "GL_INT8_VEC3_NV"),     # 0x8FE2
@@ -2715,6 +2787,8 @@ parameters = [
     ("",       X,      1,      "GL_LUMINANCE16_SNORM"),        # 0x9019
     ("",       X,      1,      "GL_LUMINANCE16_ALPHA16_SNORM"),        # 0x901A
     ("",       X,      1,      "GL_INTENSITY16_SNORM"),        # 0x901B
+    ("",       X,      1,      "GL_FACTOR_MIN_AMD"),   # 0x901C
+    ("",       X,      1,      "GL_FACTOR_MAX_AMD"),   # 0x901D
     ("",       B,      1,      "GL_DEPTH_CLAMP_NEAR_AMD"),     # 0x901E
     ("",       B,      1,      "GL_DEPTH_CLAMP_FAR_AMD"),      # 0x901F
     ("",       X,      1,      "GL_VIDEO_BUFFER_NV"),  # 0x9020
@@ -2746,42 +2820,57 @@ parameters = [
     ("",       X,      1,      "GL_VIDEO_CAPTURE_FIELD_UPPER_HEIGHT_NV"),      # 0x903A
     ("",       X,      1,      "GL_VIDEO_CAPTURE_FIELD_LOWER_HEIGHT_NV"),      # 0x903B
     ("",       X,      1,      "GL_VIDEO_CAPTURE_SURFACE_ORIGIN_NV"),  # 0x903C
-    ("",       X,      1,      "GL_IMAGE_1D_EXT"),     # 0x904C
-    ("",       X,      1,      "GL_IMAGE_2D_EXT"),     # 0x904D
-    ("",       X,      1,      "GL_IMAGE_3D_EXT"),     # 0x904E
-    ("",       X,      1,      "GL_IMAGE_2D_RECT_EXT"),        # 0x904F
-    ("",       X,      1,      "GL_IMAGE_CUBE_EXT"),   # 0x9050
-    ("",       X,      1,      "GL_IMAGE_BUFFER_EXT"), # 0x9051
-    ("",       X,      1,      "GL_IMAGE_1D_ARRAY_EXT"),       # 0x9052
-    ("",       X,      1,      "GL_IMAGE_2D_ARRAY_EXT"),       # 0x9053
-    ("",       X,      1,      "GL_IMAGE_CUBE_MAP_ARRAY_EXT"), # 0x9054
-    ("",       X,      1,      "GL_IMAGE_2D_MULTISAMPLE_EXT"), # 0x9055
-    ("",       X,      1,      "GL_IMAGE_2D_MULTISAMPLE_ARRAY_EXT"),   # 0x9056
-    ("",       X,      1,      "GL_INT_IMAGE_1D_EXT"), # 0x9057
-    ("",       X,      1,      "GL_INT_IMAGE_2D_EXT"), # 0x9058
-    ("",       X,      1,      "GL_INT_IMAGE_3D_EXT"), # 0x9059
-    ("",       X,      1,      "GL_INT_IMAGE_2D_RECT_EXT"),    # 0x905A
-    ("",       X,      1,      "GL_INT_IMAGE_CUBE_EXT"),       # 0x905B
-    ("",       X,      1,      "GL_INT_IMAGE_BUFFER_EXT"),     # 0x905C
-    ("",       X,      1,      "GL_INT_IMAGE_1D_ARRAY_EXT"),   # 0x905D
-    ("",       X,      1,      "GL_INT_IMAGE_2D_ARRAY_EXT"),   # 0x905E
-    ("",       X,      1,      "GL_INT_IMAGE_CUBE_MAP_ARRAY_EXT"),     # 0x905F
-    ("",       X,      1,      "GL_INT_IMAGE_2D_MULTISAMPLE_EXT"),     # 0x9060
-    ("",       X,      1,      "GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT"),       # 0x9061
-    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_1D_EXT"),        # 0x9062
-    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_2D_EXT"),        # 0x9063
-    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_3D_EXT"),        # 0x9064
-    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_2D_RECT_EXT"),   # 0x9065
-    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_CUBE_EXT"),      # 0x9066
-    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_BUFFER_EXT"),    # 0x9067
-    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_1D_ARRAY_EXT"),  # 0x9068
-    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_2D_ARRAY_EXT"),  # 0x9069
-    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY_EXT"),    # 0x906A
-    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_EXT"),    # 0x906B
-    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY_EXT"),      # 0x906C
-    ("",       X,      1,      "GL_MAX_IMAGE_SAMPLES_EXT"),    # 0x906D
-    ("",       X,      1,      "GL_IMAGE_BINDING_FORMAT_EXT"), # 0x906E
+    ("",       X,      1,      "GL_TEXTURE_COVERAGE_SAMPLES_NV"),      # 0x9045
+    ("",       X,      1,      "GL_TEXTURE_COLOR_SAMPLES_NV"), # 0x9046
+    ("",       X,      1,      "GL_IMAGE_1D"), # 0x904C
+    ("",       X,      1,      "GL_IMAGE_2D"), # 0x904D
+    ("",       X,      1,      "GL_IMAGE_3D"), # 0x904E
+    ("",       X,      1,      "GL_IMAGE_2D_RECT"),    # 0x904F
+    ("",       X,      1,      "GL_IMAGE_CUBE"),       # 0x9050
+    ("",       X,      1,      "GL_IMAGE_BUFFER"),     # 0x9051
+    ("",       X,      1,      "GL_IMAGE_1D_ARRAY"),   # 0x9052
+    ("",       X,      1,      "GL_IMAGE_2D_ARRAY"),   # 0x9053
+    ("",       X,      1,      "GL_IMAGE_CUBE_MAP_ARRAY"),     # 0x9054
+    ("",       X,      1,      "GL_IMAGE_2D_MULTISAMPLE"),     # 0x9055
+    ("",       X,      1,      "GL_IMAGE_2D_MULTISAMPLE_ARRAY"),       # 0x9056
+    ("",       X,      1,      "GL_INT_IMAGE_1D"),     # 0x9057
+    ("",       X,      1,      "GL_INT_IMAGE_2D"),     # 0x9058
+    ("",       X,      1,      "GL_INT_IMAGE_3D"),     # 0x9059
+    ("",       X,      1,      "GL_INT_IMAGE_2D_RECT"),        # 0x905A
+    ("",       X,      1,      "GL_INT_IMAGE_CUBE"),   # 0x905B
+    ("",       X,      1,      "GL_INT_IMAGE_BUFFER"), # 0x905C
+    ("",       X,      1,      "GL_INT_IMAGE_1D_ARRAY"),       # 0x905D
+    ("",       X,      1,      "GL_INT_IMAGE_2D_ARRAY"),       # 0x905E
+    ("",       X,      1,      "GL_INT_IMAGE_CUBE_MAP_ARRAY"), # 0x905F
+    ("",       X,      1,      "GL_INT_IMAGE_2D_MULTISAMPLE"), # 0x9060
+    ("",       X,      1,      "GL_INT_IMAGE_2D_MULTISAMPLE_ARRAY"),   # 0x9061
+    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_1D"),    # 0x9062
+    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_2D"),    # 0x9063
+    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_3D"),    # 0x9064
+    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_2D_RECT"),       # 0x9065
+    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_CUBE"),  # 0x9066
+    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_BUFFER"),        # 0x9067
+    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_1D_ARRAY"),      # 0x9068
+    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_2D_ARRAY"),      # 0x9069
+    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_CUBE_MAP_ARRAY"),        # 0x906A
+    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE"),        # 0x906B
+    ("",       X,      1,      "GL_UNSIGNED_INT_IMAGE_2D_MULTISAMPLE_ARRAY"),  # 0x906C
+    ("",       X,      1,      "GL_MAX_IMAGE_SAMPLES"),        # 0x906D
+    ("",       X,      1,      "GL_IMAGE_BINDING_FORMAT"),     # 0x906E
     ("",       X,      1,      "GL_RGB10_A2UI"),       # 0x906F
+    ("",       X,      1,      "GL_SCALED_RESOLVE_FASTEST_EXT"),       # 0x90BA
+    ("",       X,      1,      "GL_SCALED_RESOLVE_NICEST_EXT"),        # 0x90BB
+    ("",       X,      1,      "GL_MIN_MAP_BUFFER_ALIGNMENT"), # 0x90BC
+    ("",       X,      1,      "GL_IMAGE_FORMAT_COMPATIBILITY_TYPE"),  # 0x90C7
+    ("",       X,      1,      "GL_IMAGE_FORMAT_COMPATIBILITY_BY_SIZE"),       # 0x90C8
+    ("",       X,      1,      "GL_IMAGE_FORMAT_COMPATIBILITY_BY_CLASS"),      # 0x90C9
+    ("",       X,      1,      "GL_MAX_VERTEX_IMAGE_UNIFORMS"),        # 0x90CA
+    ("",       X,      1,      "GL_MAX_TESS_CONTROL_IMAGE_UNIFORMS"),  # 0x90CB
+    ("",       X,      1,      "GL_MAX_TESS_EVALUATION_IMAGE_UNIFORMS"),       # 0x90CC
+    ("",       X,      1,      "GL_MAX_GEOMETRY_IMAGE_UNIFORMS"),      # 0x90CD
+    ("",       X,      1,      "GL_MAX_FRAGMENT_IMAGE_UNIFORMS"),      # 0x90CE
+    ("",       X,      1,      "GL_MAX_COMBINED_IMAGE_UNIFORMS"),      # 0x90CF
+    ("",       X,      1,      "GL_SYNC_X11_FENCE_EXT"),       # 0x90E1
     ("",       X,      1,      "GL_TEXTURE_2D_MULTISAMPLE"),   # 0x9100
     ("",       X,      1,      "GL_PROXY_TEXTURE_2D_MULTISAMPLE"),     # 0x9101
     ("",       X,      1,      "GL_TEXTURE_2D_MULTISAMPLE_ARRAY"),     # 0x9102
@@ -2820,6 +2909,20 @@ parameters = [
     ("",       X,      1,      "GL_MAX_GEOMETRY_OUTPUT_COMPONENTS"),   # 0x9124
     ("",       X,      1,      "GL_MAX_FRAGMENT_INPUT_COMPONENTS"),    # 0x9125
     ("glGet",  I,      1,      "GL_CONTEXT_PROFILE_MASK"),     # 0x9126
+    ("",       X,      1,      "GL_UNPACK_COMPRESSED_BLOCK_WIDTH"),    # 0x9127
+    ("",       X,      1,      "GL_UNPACK_COMPRESSED_BLOCK_HEIGHT"),   # 0x9128
+    ("",       X,      1,      "GL_UNPACK_COMPRESSED_BLOCK_DEPTH"),    # 0x9129
+    ("",       X,      1,      "GL_UNPACK_COMPRESSED_BLOCK_SIZE"),     # 0x912A
+    ("",       X,      1,      "GL_PACK_COMPRESSED_BLOCK_WIDTH"),      # 0x912B
+    ("",       X,      1,      "GL_PACK_COMPRESSED_BLOCK_HEIGHT"),     # 0x912C
+    ("",       X,      1,      "GL_PACK_COMPRESSED_BLOCK_DEPTH"),      # 0x912D
+    ("",       X,      1,      "GL_PACK_COMPRESSED_BLOCK_SIZE"),       # 0x912E
+    ("",       X,      1,      "GL_TEXTURE_IMMUTABLE_FORMAT"), # 0x912F
+    #("",      X,      1,      "GL_SGX_PROGRAM_BINARY_IMG"),   # 0x9130
+    #("",      X,      1,      "GL_RENDERBUFFER_SAMPLES_IMG"), # 0x9133
+    #("",      X,      1,      "GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_IMG"),   # 0x9134
+    #("",      X,      1,      "GL_MAX_SAMPLES_IMG"),  # 0x9135
+    #("",      X,      1,      "GL_TEXTURE_SAMPLES_IMG"),      # 0x9136
     ("",       X,      1,      "GL_MAX_DEBUG_MESSAGE_LENGTH_ARB"),     # 0x9143
     ("",       X,      1,      "GL_MAX_DEBUG_LOGGED_MESSAGES_ARB"),    # 0x9144
     ("",       X,      1,      "GL_DEBUG_LOGGED_MESSAGES_ARB"),        # 0x9145
@@ -2839,6 +2942,37 @@ parameters = [
     ("",       X,      1,      "GL_QUERY_OBJECT_AMD"), # 0x9153
     ("",       X,      1,      "GL_VERTEX_ARRAY_OBJECT_AMD"),  # 0x9154
     ("",       X,      1,      "GL_SAMPLER_OBJECT_AMD"),       # 0x9155
+    #("",      X,      1,      "GL_SHADER_BINARY_DMP"),        # 0x9250
+    ("",       X,      1,      "GL_ATOMIC_COUNTER_BUFFER"),    # 0x92C0
+    ("",       X,      1,      "GL_ATOMIC_COUNTER_BUFFER_BINDING"),    # 0x92C1
+    ("",       X,      1,      "GL_ATOMIC_COUNTER_BUFFER_START"),      # 0x92C2
+    ("",       X,      1,      "GL_ATOMIC_COUNTER_BUFFER_SIZE"),       # 0x92C3
+    ("",       X,      1,      "GL_ATOMIC_COUNTER_BUFFER_DATA_SIZE"),  # 0x92C4
+    ("",       X,      1,      "GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTERS"),     # 0x92C5
+    ("",       X,      1,      "GL_ATOMIC_COUNTER_BUFFER_ACTIVE_ATOMIC_COUNTER_INDICES"),      # 0x92C6
+    ("",       X,      1,      "GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_VERTEX_SHADER"),        # 0x92C7
+    ("",       X,      1,      "GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_CONTROL_SHADER"),  # 0x92C8
+    ("",       X,      1,      "GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_TESS_EVALUATION_SHADER"),       # 0x92C9
+    ("",       X,      1,      "GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_GEOMETRY_SHADER"),      # 0x92CA
+    ("",       X,      1,      "GL_ATOMIC_COUNTER_BUFFER_REFERENCED_BY_FRAGMENT_SHADER"),      # 0x92CB
+    ("",       X,      1,      "GL_MAX_VERTEX_ATOMIC_COUNTER_BUFFERS"),        # 0x92CC
+    ("",       X,      1,      "GL_MAX_TESS_CONTROL_ATOMIC_COUNTER_BUFFERS"),  # 0x92CD
+    ("",       X,      1,      "GL_MAX_TESS_EVALUATION_ATOMIC_COUNTER_BUFFERS"),       # 0x92CE
+    ("",       X,      1,      "GL_MAX_GEOMETRY_ATOMIC_COUNTER_BUFFERS"),      # 0x92CF
+    ("",       X,      1,      "GL_MAX_FRAGMENT_ATOMIC_COUNTER_BUFFERS"),      # 0x92D0
+    ("",       X,      1,      "GL_MAX_COMBINED_ATOMIC_COUNTER_BUFFERS"),      # 0x92D1
+    ("",       X,      1,      "GL_MAX_VERTEX_ATOMIC_COUNTERS"),       # 0x92D2
+    ("",       X,      1,      "GL_MAX_TESS_CONTROL_ATOMIC_COUNTERS"), # 0x92D3
+    ("",       X,      1,      "GL_MAX_TESS_EVALUATION_ATOMIC_COUNTERS"),      # 0x92D4
+    ("",       X,      1,      "GL_MAX_GEOMETRY_ATOMIC_COUNTERS"),     # 0x92D5
+    ("",       X,      1,      "GL_MAX_FRAGMENT_ATOMIC_COUNTERS"),     # 0x92D6
+    ("",       X,      1,      "GL_MAX_COMBINED_ATOMIC_COUNTERS"),     # 0x92D7
+    ("",       X,      1,      "GL_MAX_ATOMIC_COUNTER_BUFFER_SIZE"),   # 0x92D8
+    ("",       X,      1,      "GL_ACTIVE_ATOMIC_COUNTER_BUFFERS"),    # 0x92D9
+    ("",       X,      1,      "GL_UNIFORM_ATOMIC_COUNTER_BUFFER_INDEX"),      # 0x92DA
+    ("",       X,      1,      "GL_UNSIGNED_INT_ATOMIC_COUNTER"),      # 0x92DB
+    ("",       X,      1,      "GL_MAX_ATOMIC_COUNTER_BUFFER_BINDINGS"),       # 0x92DC
+    ("",       X,      1,      "GL_NUM_SAMPLE_COUNTS"),        # 0x9380
     ("",       X,      1,      "GL_INVALID_INDEX"),    # 0xFFFFFFFFu
 ]
 

diff --git a/glretrace.py b/glretrace.py
index b6dac924ef5b4e350f2ee0321c81fae96696eb15..671d164e96d62976be400314a4c1d491e5e75388 100644 (file)
--- a/glretrace.py
+++ b/glretrace.py
@@ -99,6 +99,11 @@ class GlRetracer(Retracer):
         "glMultiModeDrawElementsIBM",
     ])
 
+    draw_indirect_function_names = set([
+        "glDrawArraysIndirect",
+        "glDrawElementsIndirect",
+    ])
+
     misc_draw_function_names = set([
         "glClear",
         "glEnd",
@@ -308,7 +313,8 @@ class GlRetracer(Retracer):
             print '    %s = static_cast<%s>(%s.toPointer(true));' % (lvalue, arg_type, rvalue)
             return
 
-        if function.name in self.draw_elements_function_names and arg.name == 'indices':
+        if function.name in self.draw_elements_function_names and arg.name == 'indices' or\
+           function.name in self.draw_indirect_function_names and arg.name == 'indirect':
             self.extract_opaque_arg(function, arg, arg_type, lvalue, rvalue)
             return
 

diff --git a/gltypes.py b/gltypes.py
index 32a6ca890612431543032d140ff4d3169a6298b8..e25cd7e686b3352732594bd45fe65b2a2d4c49e8 100644 (file)
--- a/gltypes.py
+++ b/gltypes.py
@@ -82,6 +82,7 @@ GLregion = Handle("region", GLuint)
 GLmap = Handle("map", OpaquePointer(GLvoid))
 GLpipeline = Handle("pipeline", GLuint)
 GLsampler = Handle("sampler", GLuint)
+GLfeedback = Handle("feedback", GLuint)
 
 GLsync_ = Opaque("GLsync")
 GLsync = Handle("sync", GLsync_)
@@ -182,3 +183,21 @@ GLbitfield_access = Flags(GLbitfield, [
 GLbitfield_sync_flush = Flags(GLbitfield, [
     "GL_SYNC_FLUSH_COMMANDS_BIT",                              # 0x00000001
 ])
+
+GLbitfield_barrier = Flags(GLbitfield, [
+    "GL_ALL_BARRIER_BITS",                      # 0xFFFFFFFF
+    "GL_VERTEX_ATTRIB_ARRAY_BARRIER_BIT",       # 0x00000001
+    "GL_ELEMENT_ARRAY_BARRIER_BIT",             # 0x00000002
+    "GL_UNIFORM_BARRIER_BIT",                   # 0x00000004
+    "GL_TEXTURE_FETCH_BARRIER_BIT",             # 0x00000008
+    "GL_SHADER_GLOBAL_ACCESS_BARRIER_BIT_NV",   # 0x00000010
+    "GL_SHADER_IMAGE_ACCESS_BARRIER_BIT",       # 0x00000020
+    "GL_COMMAND_BARRIER_BIT",                   # 0x00000040
+    "GL_PIXEL_BUFFER_BARRIER_BIT",              # 0x00000080
+    "GL_TEXTURE_UPDATE_BARRIER_BIT",            # 0x00000100
+    "GL_BUFFER_UPDATE_BARRIER_BIT",             # 0x00000200
+    "GL_FRAMEBUFFER_BARRIER_BIT",               # 0x00000400
+    "GL_TRANSFORM_FEEDBACK_BARRIER_BIT",        # 0x00000800
+    "GL_ATOMIC_COUNTER_BARRIER_BIT",            # 0x00001000
+])
+