X-Git-Url: https://git.cworth.org/git?a=blobdiff_plain;f=specs%2Fglesapi.py;h=9d1679847b02b9d032c52dd5d04092ecd03a2ebf;hb=ac2589fde46354dd224165f4d65f03b636c2d4b1;hp=240840ecbb8badde00982fdcf7d5ff2dea6f9b97;hpb=fe93afda27cd74da30f82549cad39f2a03b6e718;p=apitrace

diff --git a/specs/glesapi.py b/specs/glesapi.py
index 240840e..9d16798 100644
--- a/specs/glesapi.py
+++ b/specs/glesapi.py
@@ -44,7 +44,7 @@ glesapi = API('GLES')
 
 
 # OpenGL ES specific functions
-glesapi.add_functions([
+glesapi.addFunctions([
     # GL_VERSION_ES_CM_1_1: GL_OES_single_precision
     GlFunction(Void, "glFrustumf", [(GLfloat, "left"), (GLfloat, "right"), (GLfloat, "bottom"), (GLfloat, "top"), (GLfloat, "zNear"), (GLfloat, "zFar")]),
     GlFunction(Void, "glOrthof", [(GLfloat, "left"), (GLfloat, "right"), (GLfloat, "bottom"), (GLfloat, "top"), (GLfloat, "zNear"), (GLfloat, "zFar")]),
@@ -162,11 +162,11 @@ glesapi.add_functions([
     GlFunction(Void, "glFramebufferTexture3DOES", [(GLenum, "target"), (GLenum, "attachment"), (GLenum, "textarget"), (GLtexture, "texture"), (GLint, "level"), (GLint, "zoffset")]),
 
     # GL_OES_get_program_binary
-    GlFunction(Void, "glGetProgramBinaryOES", [(GLprogram, "program"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), Out(Pointer(GLenum), "binaryFormat"), Out(OpaqueArray(GLvoid, "__glGetProgramBinary_size(length)"), "binary")], sideeffects=False),
+    GlFunction(Void, "glGetProgramBinaryOES", [(GLprogram, "program"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), Out(Pointer(GLenum), "binaryFormat"), Out(OpaqueBlob(GLvoid, "length ? *length : bufSize"), "binary")], sideeffects=False),
     GlFunction(Void, "glProgramBinaryOES", [(GLprogram, "program"), (GLenum, "binaryFormat"), (Blob(Const(GLvoid), "length"), "binary"), (GLsizei, "length")]),
 
     # GL_EXT_discard_framebuffer
-    GlFunction(Void, "glDiscardFramebufferEXT", [(GLenum, "target"), (GLsizei, "numAttachments"), (OpaquePointer(Const(GLenum)), "attachments")]),
+    GlFunction(Void, "glDiscardFramebufferEXT", [(GLenum, "target"), (GLsizei, "numAttachments"), (Array(Const(GLenum), "numAttachments"), "attachments")]),
 
     # GL_OES_vertex_array_object
     GlFunction(Void, "glBindVertexArrayOES", [(GLarray, "array")]),
@@ -203,18 +203,18 @@ glesapi.add_functions([
     GlFunction(Void, "glGetObjectLabelEXT", [(GLenum, "type"), (GLuint, "object"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), Out(GLstring, "label")], sideeffects=False),
 
     # GL_EXT_debug_marker
-    GlFunction(Void, "glInsertEventMarkerEXT", [(GLsizei, "length"), (Const(GLstring), "marker")]),
-    GlFunction(Void, "glPushGroupMarkerEXT", [(GLsizei, "length"), (Const(GLstring), "marker")]),
-    GlFunction(Void, "glPopGroupMarkerEXT", []),
+    GlFunction(Void, "glInsertEventMarkerEXT", [(GLsizei, "length"), (Const(String("GLchar *", "length ? length : strlen(marker)")), "marker")], sideeffects=False),
+    GlFunction(Void, "glPushGroupMarkerEXT", [(GLsizei, "length"), (Const(String("GLchar *", "length ? length : strlen(marker)")), "marker")], sideeffects=False),
+    GlFunction(Void, "glPopGroupMarkerEXT", [], sideeffects=False),
 
     # GL_EXT_occlusion_query_boolean
-    GlFunction(Void, "glGenQueriesEXT", [(GLsizei, "n"), (OpaquePointer(GLuint), "ids")]),
-    GlFunction(Void, "glDeleteQueriesEXT", [(GLsizei, "n"), (OpaquePointer(Const(GLuint)), "ids")]),
-    GlFunction(GLboolean, "glIsQueryEXT", [(GLuint, "id")]),
-    GlFunction(Void, "glBeginQueryEXT", [(GLenum, "target"), (GLuint, "id")]),
+    GlFunction(Void, "glGenQueriesEXT", [(GLsizei, "n"), Out(Array(GLquery, "n"), "ids")]),
+    GlFunction(Void, "glDeleteQueriesEXT", [(GLsizei, "n"), (Array(Const(GLquery), "n"), "ids")]),
+    GlFunction(GLboolean, "glIsQueryEXT", [(GLquery, "id")], sideeffects=False),
+    GlFunction(Void, "glBeginQueryEXT", [(GLenum, "target"), (GLquery, "id")]),
     GlFunction(Void, "glEndQueryEXT", [(GLenum, "target")]),
-    GlFunction(Void, "glGetQueryivEXT", [(GLenum, "target"), (GLenum, "pname"), (OpaquePointer(GLint), "params")], sideeffects=False),
-    GlFunction(Void, "glGetQueryObjectuivEXT", [(GLuint, "id"), (GLenum, "pname"), (OpaquePointer(GLuint), "params")], sideeffects=False),
+    GlFunction(Void, "glGetQueryivEXT", [(GLenum, "target"), (GLenum, "pname"), Out(Array(GLint, "__gl_param_size(pname)"), "params")], sideeffects=False),
+    GlFunction(Void, "glGetQueryObjectuivEXT", [(GLquery, "id"), (GLenum, "pname"), Out(Array(GLuint, "__gl_param_size(pname)"), "params")], sideeffects=False),
 
     # GL_EXT_separate_shader_objects
     GlFunction(Void, "glUseProgramStagesEXT", [(GLpipeline, "pipeline"), (GLbitfield_shader, "stages"), (GLprogram, "program")]),