From 23b5043d024fad0bf65c05af3c436909d6cedadf Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Fonseca?= Date: Tue, 30 Nov 2010 20:50:36 +0000 Subject: [PATCH] Use a map for uniform locations. --- glapi.py | 156 ++++++++++++++++++++++++++++--------------------------- 1 file changed, 79 insertions(+), 77 deletions(-) diff --git a/glapi.py b/glapi.py index 8afb411..31a3379 100644 --- a/glapi.py +++ b/glapi.py @@ -76,6 +76,8 @@ GLquery = Handle("query", GLuint) GLfenceNV = Handle("fenceNV", GLuint) GLprogram = Handle("program", GLuint) GLshader = Handle("shader", GLuint) +GLlocation = Handle("location", GLint) +GLlocationARB = Handle("locationARB", GLint) GLprogramARB = Handle("programARB", GLuint) GLprogramEXT = Handle("programEXT", GLuint) GLprogramNV = Handle("programNV", GLuint) @@ -629,9 +631,9 @@ glapi.add_functions([ GlFunction(Void, "glGetShaderiv", [(GLshader, "shader"), (GLenum, "pname"), Out(Pointer(GLint), "params")], sideeffects=False), GlFunction(Void, "glGetShaderInfoLog", [(GLshader, "shader"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), Out(GLstring, "infoLog")], sideeffects=False), GlFunction(Void, "glGetShaderSource", [(GLshader, "shader"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), Out(String("GLchar *", "*length"), "source")], sideeffects=False), - GlFunction(GLint, "glGetUniformLocation", [(GLprogram, "program"), (Const(GLstring), "name")], sideeffects=False), - GlFunction(Void, "glGetUniformfv", [(GLprogram, "program"), (GLint, "location"), Out(OpaquePointer(GLfloat), "params")], sideeffects=False), - GlFunction(Void, "glGetUniformiv", [(GLprogram, "program"), (GLint, "location"), Out(OpaquePointer(GLint), "params")], sideeffects=False), + GlFunction(GLlocation, "glGetUniformLocation", [(GLprogram, "program"), (Const(GLstring), "name")]), + GlFunction(Void, "glGetUniformfv", [(GLprogram, "program"), (GLlocation, "location"), Out(OpaquePointer(GLfloat), "params")], sideeffects=False), + GlFunction(Void, "glGetUniformiv", [(GLprogram, "program"), (GLlocation, "location"), Out(OpaquePointer(GLint), "params")], sideeffects=False), GlFunction(Void, "glGetVertexAttribdv", [(GLuint, "index"), (GLenum, "pname"), Out(Array(GLdouble, "4"), "params")], sideeffects=False), GlFunction(Void, "glGetVertexAttribfv", [(GLuint, "index"), (GLenum, "pname"), Out(Array(GLfloat, "4"), "params")], sideeffects=False), GlFunction(Void, "glGetVertexAttribiv", [(GLuint, "index"), (GLenum, "pname"), Out(Array(GLint, "4"), "params")], sideeffects=False), @@ -641,25 +643,25 @@ glapi.add_functions([ GlFunction(Void, "glLinkProgram", [(GLprogram, "program")]), GlFunction(Void, "glShaderSource", [(GLshader, "shader"), (GLsizei, "count"), (Const(Array(Const(GLstringARB), "count")), "string"), (Const(Array(GLint, "count")), "length")]), GlFunction(Void, "glUseProgram", [(GLprogram, "program")]), - GlFunction(Void, "glUniform1f", [(GLint, "location"), (GLfloat, "v0")]), - GlFunction(Void, "glUniform2f", [(GLint, "location"), (GLfloat, "v0"), (GLfloat, "v1")]), - GlFunction(Void, "glUniform3f", [(GLint, "location"), (GLfloat, "v0"), (GLfloat, "v1"), (GLfloat, "v2")]), - GlFunction(Void, "glUniform4f", [(GLint, "location"), (GLfloat, "v0"), (GLfloat, "v1"), (GLfloat, "v2"), (GLfloat, "v3")]), - GlFunction(Void, "glUniform1i", [(GLint, "location"), (GLint, "v0")]), - GlFunction(Void, "glUniform2i", [(GLint, "location"), (GLint, "v0"), (GLint, "v1")]), - GlFunction(Void, "glUniform3i", [(GLint, "location"), (GLint, "v0"), (GLint, "v1"), (GLint, "v2")]), - GlFunction(Void, "glUniform4i", [(GLint, "location"), (GLint, "v0"), (GLint, "v1"), (GLint, "v2"), (GLint, "v3")]), - GlFunction(Void, "glUniform1fv", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "count")), "value")]), - GlFunction(Void, "glUniform2fv", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "count")), "value")]), - GlFunction(Void, "glUniform3fv", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "count")), "value")]), - GlFunction(Void, "glUniform4fv", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "count")), "value")]), - GlFunction(Void, "glUniform1iv", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLint, "count")), "value")]), - GlFunction(Void, "glUniform2iv", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLint, "count")), "value")]), - GlFunction(Void, "glUniform3iv", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLint, "count")), "value")]), - GlFunction(Void, "glUniform4iv", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLint, "count")), "value")]), - GlFunction(Void, "glUniformMatrix2fv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "4")), "value")]), - GlFunction(Void, "glUniformMatrix3fv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "9")), "value")]), - GlFunction(Void, "glUniformMatrix4fv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "16")), "value")]), + GlFunction(Void, "glUniform1f", [(GLlocation, "location"), (GLfloat, "v0")]), + GlFunction(Void, "glUniform2f", [(GLlocation, "location"), (GLfloat, "v0"), (GLfloat, "v1")]), + GlFunction(Void, "glUniform3f", [(GLlocation, "location"), (GLfloat, "v0"), (GLfloat, "v1"), (GLfloat, "v2")]), + GlFunction(Void, "glUniform4f", [(GLlocation, "location"), (GLfloat, "v0"), (GLfloat, "v1"), (GLfloat, "v2"), (GLfloat, "v3")]), + GlFunction(Void, "glUniform1i", [(GLlocation, "location"), (GLint, "v0")]), + GlFunction(Void, "glUniform2i", [(GLlocation, "location"), (GLint, "v0"), (GLint, "v1")]), + GlFunction(Void, "glUniform3i", [(GLlocation, "location"), (GLint, "v0"), (GLint, "v1"), (GLint, "v2")]), + GlFunction(Void, "glUniform4i", [(GLlocation, "location"), (GLint, "v0"), (GLint, "v1"), (GLint, "v2"), (GLint, "v3")]), + GlFunction(Void, "glUniform1fv", [(GLlocation, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "count")), "value")]), + GlFunction(Void, "glUniform2fv", [(GLlocation, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "count")), "value")]), + GlFunction(Void, "glUniform3fv", [(GLlocation, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "count")), "value")]), + GlFunction(Void, "glUniform4fv", [(GLlocation, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "count")), "value")]), + GlFunction(Void, "glUniform1iv", [(GLlocation, "location"), (GLsizei, "count"), (Const(Array(GLint, "count")), "value")]), + GlFunction(Void, "glUniform2iv", [(GLlocation, "location"), (GLsizei, "count"), (Const(Array(GLint, "count")), "value")]), + GlFunction(Void, "glUniform3iv", [(GLlocation, "location"), (GLsizei, "count"), (Const(Array(GLint, "count")), "value")]), + GlFunction(Void, "glUniform4iv", [(GLlocation, "location"), (GLsizei, "count"), (Const(Array(GLint, "count")), "value")]), + GlFunction(Void, "glUniformMatrix2fv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "4")), "value")]), + GlFunction(Void, "glUniformMatrix3fv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "9")), "value")]), + GlFunction(Void, "glUniformMatrix4fv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "16")), "value")]), GlFunction(Void, "glValidateProgram", [(GLprogram, "program")]), GlFunction(Void, "glVertexAttrib1d", [(GLuint, "index"), (GLdouble, "x")]), GlFunction(Void, "glVertexAttrib1dv", [(GLuint, "index"), (Const(Pointer(GLdouble)), "v")]), @@ -700,12 +702,12 @@ glapi.add_functions([ GlFunction(Void, "glVertexAttribPointer", [(GLuint, "index"), (GLint, "size"), (GLenum, "type"), (GLboolean, "normalized"), (GLsizei, "stride"), (Const(OpaquePointer(GLvoid)), "pointer")]), # GL_VERSION_2_1 - GlFunction(Void, "glUniformMatrix2x3fv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "6")), "value")]), - GlFunction(Void, "glUniformMatrix3x2fv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "6")), "value")]), - GlFunction(Void, "glUniformMatrix2x4fv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "8")), "value")]), - GlFunction(Void, "glUniformMatrix4x2fv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "8")), "value")]), - GlFunction(Void, "glUniformMatrix3x4fv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "12")), "value")]), - GlFunction(Void, "glUniformMatrix4x3fv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "12")), "value")]), + GlFunction(Void, "glUniformMatrix2x3fv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "6")), "value")]), + GlFunction(Void, "glUniformMatrix3x2fv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "6")), "value")]), + GlFunction(Void, "glUniformMatrix2x4fv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "8")), "value")]), + GlFunction(Void, "glUniformMatrix4x2fv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "8")), "value")]), + GlFunction(Void, "glUniformMatrix3x4fv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "12")), "value")]), + GlFunction(Void, "glUniformMatrix4x3fv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "12")), "value")]), # GL_VERSION_3_0 GlFunction(Void, "glColorMaski", [(GLuint, "index"), (GLboolean, "r"), (GLboolean, "g"), (GLboolean, "b"), (GLboolean, "a")]), @@ -746,17 +748,17 @@ glapi.add_functions([ GlFunction(Void, "glVertexAttribI4sv", [(GLuint, "index"), (Const(Array(GLshort, "4")), "v")]), GlFunction(Void, "glVertexAttribI4ubv", [(GLuint, "index"), (Const(Array(GLubyte, "4")), "v")]), GlFunction(Void, "glVertexAttribI4usv", [(GLuint, "index"), (Const(Array(GLushort, "4")), "v")]), - GlFunction(Void, "glGetUniformuiv", [(GLuint, "program"), (GLint, "location"), Out(OpaqueArray(GLuint, "__glGetUniformuiv_size(program, location)"), "params")], sideeffects=False), + GlFunction(Void, "glGetUniformuiv", [(GLuint, "program"), (GLlocation, "location"), Out(OpaqueArray(GLuint, "__glGetUniformuiv_size(program, location)"), "params")], sideeffects=False), GlFunction(Void, "glBindFragDataLocation", [(GLuint, "program"), (GLuint, "color"), (Const(OpaqueArray(GLchar, "__glBindFragDataLocation_size(name)")), "name")]), GlFunction(GLint, "glGetFragDataLocation", [(GLuint, "program"), (Const(OpaqueArray(GLchar, "__glGetFragDataLocation_size(name)")), "name")], sideeffects=False), - GlFunction(Void, "glUniform1ui", [(GLint, "location"), (GLuint, "v0")]), - GlFunction(Void, "glUniform2ui", [(GLint, "location"), (GLuint, "v0"), (GLuint, "v1")]), - GlFunction(Void, "glUniform3ui", [(GLint, "location"), (GLuint, "v0"), (GLuint, "v1"), (GLuint, "v2")]), - GlFunction(Void, "glUniform4ui", [(GLint, "location"), (GLuint, "v0"), (GLuint, "v1"), (GLuint, "v2"), (GLuint, "v3")]), - GlFunction(Void, "glUniform1uiv", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLuint, "count")), "value")]), - GlFunction(Void, "glUniform2uiv", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLuint, "count*2")), "value")]), - GlFunction(Void, "glUniform3uiv", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLuint, "count*3")), "value")]), - GlFunction(Void, "glUniform4uiv", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLuint, "count*4")), "value")]), + GlFunction(Void, "glUniform1ui", [(GLlocation, "location"), (GLuint, "v0")]), + GlFunction(Void, "glUniform2ui", [(GLlocation, "location"), (GLuint, "v0"), (GLuint, "v1")]), + GlFunction(Void, "glUniform3ui", [(GLlocation, "location"), (GLuint, "v0"), (GLuint, "v1"), (GLuint, "v2")]), + GlFunction(Void, "glUniform4ui", [(GLlocation, "location"), (GLuint, "v0"), (GLuint, "v1"), (GLuint, "v2"), (GLuint, "v3")]), + GlFunction(Void, "glUniform1uiv", [(GLlocation, "location"), (GLsizei, "count"), (Const(Array(GLuint, "count")), "value")]), + GlFunction(Void, "glUniform2uiv", [(GLlocation, "location"), (GLsizei, "count"), (Const(Array(GLuint, "count*2")), "value")]), + GlFunction(Void, "glUniform3uiv", [(GLlocation, "location"), (GLsizei, "count"), (Const(Array(GLuint, "count*3")), "value")]), + GlFunction(Void, "glUniform4uiv", [(GLlocation, "location"), (GLsizei, "count"), (Const(Array(GLuint, "count*4")), "value")]), GlFunction(Void, "glTexParameterIiv", [(GLenum, "target"), (GLenum, "pname"), (Const(OpaqueArray(GLint, "__glTexParameterIiv_size(pname)")), "params")]), GlFunction(Void, "glTexParameterIuiv", [(GLenum, "target"), (GLenum, "pname"), (Const(OpaqueArray(GLuint, "__glTexParameterIuiv_size(pname)")), "params")]), GlFunction(Void, "glGetTexParameterIiv", [(GLenum, "target"), (GLenum, "pname"), Out(OpaqueArray(GLint, "__glGetTexParameterIiv_size(pname)"), "params")], sideeffects=False), @@ -982,33 +984,33 @@ glapi.add_functions([ GlFunction(Void, "glLinkProgramARB", [(GLhandleARB, "programObj")]), GlFunction(Void, "glUseProgramObjectARB", [(GLhandleARB, "programObj")]), GlFunction(Void, "glValidateProgramARB", [(GLhandleARB, "programObj")]), - GlFunction(Void, "glUniform1fARB", [(GLint, "location"), (GLfloat, "v0")]), - GlFunction(Void, "glUniform2fARB", [(GLint, "location"), (GLfloat, "v0"), (GLfloat, "v1")]), - GlFunction(Void, "glUniform3fARB", [(GLint, "location"), (GLfloat, "v0"), (GLfloat, "v1"), (GLfloat, "v2")]), - GlFunction(Void, "glUniform4fARB", [(GLint, "location"), (GLfloat, "v0"), (GLfloat, "v1"), (GLfloat, "v2"), (GLfloat, "v3")]), - GlFunction(Void, "glUniform1iARB", [(GLint, "location"), (GLint, "v0")]), - GlFunction(Void, "glUniform2iARB", [(GLint, "location"), (GLint, "v0"), (GLint, "v1")]), - GlFunction(Void, "glUniform3iARB", [(GLint, "location"), (GLint, "v0"), (GLint, "v1"), (GLint, "v2")]), - GlFunction(Void, "glUniform4iARB", [(GLint, "location"), (GLint, "v0"), (GLint, "v1"), (GLint, "v2"), (GLint, "v3")]), - GlFunction(Void, "glUniform1fvARB", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "count")), "value")]), - GlFunction(Void, "glUniform2fvARB", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "(2*count)")), "value")]), - GlFunction(Void, "glUniform3fvARB", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "(3*count)")), "value")]), - GlFunction(Void, "glUniform4fvARB", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "(4*count)")), "value")]), - GlFunction(Void, "glUniform1ivARB", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLint, "count")), "value")]), - GlFunction(Void, "glUniform2ivARB", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLint, "(2*count)")), "value")]), - GlFunction(Void, "glUniform3ivARB", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLint, "(3*count)")), "value")]), - GlFunction(Void, "glUniform4ivARB", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLint, "(4*count)")), "value")]), - GlFunction(Void, "glUniformMatrix2fvARB", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "4")), "value")]), - GlFunction(Void, "glUniformMatrix3fvARB", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "9")), "value")]), - GlFunction(Void, "glUniformMatrix4fvARB", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "16")), "value")]), + GlFunction(Void, "glUniform1fARB", [(GLlocationARB, "location"), (GLfloat, "v0")]), + GlFunction(Void, "glUniform2fARB", [(GLlocationARB, "location"), (GLfloat, "v0"), (GLfloat, "v1")]), + GlFunction(Void, "glUniform3fARB", [(GLlocationARB, "location"), (GLfloat, "v0"), (GLfloat, "v1"), (GLfloat, "v2")]), + GlFunction(Void, "glUniform4fARB", [(GLlocationARB, "location"), (GLfloat, "v0"), (GLfloat, "v1"), (GLfloat, "v2"), (GLfloat, "v3")]), + GlFunction(Void, "glUniform1iARB", [(GLlocationARB, "location"), (GLint, "v0")]), + GlFunction(Void, "glUniform2iARB", [(GLlocationARB, "location"), (GLint, "v0"), (GLint, "v1")]), + GlFunction(Void, "glUniform3iARB", [(GLlocationARB, "location"), (GLint, "v0"), (GLint, "v1"), (GLint, "v2")]), + GlFunction(Void, "glUniform4iARB", [(GLlocationARB, "location"), (GLint, "v0"), (GLint, "v1"), (GLint, "v2"), (GLint, "v3")]), + GlFunction(Void, "glUniform1fvARB", [(GLlocationARB, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "count")), "value")]), + GlFunction(Void, "glUniform2fvARB", [(GLlocationARB, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "(2*count)")), "value")]), + GlFunction(Void, "glUniform3fvARB", [(GLlocationARB, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "(3*count)")), "value")]), + GlFunction(Void, "glUniform4fvARB", [(GLlocationARB, "location"), (GLsizei, "count"), (Const(Array(GLfloat, "(4*count)")), "value")]), + GlFunction(Void, "glUniform1ivARB", [(GLlocationARB, "location"), (GLsizei, "count"), (Const(Array(GLint, "count")), "value")]), + GlFunction(Void, "glUniform2ivARB", [(GLlocationARB, "location"), (GLsizei, "count"), (Const(Array(GLint, "(2*count)")), "value")]), + GlFunction(Void, "glUniform3ivARB", [(GLlocationARB, "location"), (GLsizei, "count"), (Const(Array(GLint, "(3*count)")), "value")]), + GlFunction(Void, "glUniform4ivARB", [(GLlocationARB, "location"), (GLsizei, "count"), (Const(Array(GLint, "(4*count)")), "value")]), + GlFunction(Void, "glUniformMatrix2fvARB", [(GLlocationARB, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "4")), "value")]), + GlFunction(Void, "glUniformMatrix3fvARB", [(GLlocationARB, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "9")), "value")]), + GlFunction(Void, "glUniformMatrix4fvARB", [(GLlocationARB, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLfloat, "16")), "value")]), GlFunction(Void, "glGetObjectParameterfvARB", [(GLhandleARB, "obj"), (GLenum, "pname"), Out(OpaquePointer(GLfloat), "params")], sideeffects=False), GlFunction(Void, "glGetObjectParameterivARB", [(GLhandleARB, "obj"), (GLenum, "pname"), Out(OpaquePointer(GLint), "params")], sideeffects=False), GlFunction(Void, "glGetInfoLogARB", [(GLhandleARB, "obj"), (GLsizei, "maxLength"), Out(Pointer(GLsizei), "length"), Out(GLstringARB, "infoLog")], sideeffects=False), GlFunction(Void, "glGetAttachedObjectsARB", [(GLhandleARB, "containerObj"), (GLsizei, "maxLength"), (OpaquePointer(GLsizei), "length"), (OpaquePointer(GLhandleARB), "infoLog")], sideeffects=False), - GlFunction(GLint, "glGetUniformLocationARB", [(GLhandleARB, "programObj"), (Const(GLstringARB), "name")], sideeffects=False), + GlFunction(GLlocationARB, "glGetUniformLocationARB", [(GLhandleARB, "programObj"), (Const(GLstringARB), "name")], sideeffects=False), GlFunction(Void, "glGetActiveUniformARB", [(GLhandleARB, "programObj"), (GLuint, "index"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), Out(Pointer(GLint), "size"), Out(Pointer(GLenum), "type"), Out(GLstringARB, "name")], sideeffects=False), - GlFunction(Void, "glGetUniformfvARB", [(GLhandleARB, "programObj"), (GLint, "location"), (OpaquePointer(GLfloat), "params")], sideeffects=False), - GlFunction(Void, "glGetUniformivARB", [(GLhandleARB, "programObj"), (GLint, "location"), (OpaquePointer(GLint), "params")], sideeffects=False), + GlFunction(Void, "glGetUniformfvARB", [(GLhandleARB, "programObj"), (GLlocationARB, "location"), (OpaquePointer(GLfloat), "params")], sideeffects=False), + GlFunction(Void, "glGetUniformivARB", [(GLhandleARB, "programObj"), (GLlocationARB, "location"), (OpaquePointer(GLint), "params")], sideeffects=False), GlFunction(Void, "glGetShaderSourceARB", [(GLhandleARB, "obj"), (GLsizei, "bufSize"), Out(Pointer(GLsizei), "length"), Out(GLstringARB, "source")], sideeffects=False), # GL_ARB_vertex_shader @@ -1193,24 +1195,24 @@ glapi.add_functions([ GlFunction(Void, "glDrawElementsIndirect", [(GLenum, "mode"), (GLenum, "type"), (Const(OpaquePointer(GLvoid)), "indirect")]), # GL_ARB_gpu_shader_fp64 - GlFunction(Void, "glUniform1d", [(GLint, "location"), (GLdouble, "x")]), - GlFunction(Void, "glUniform2d", [(GLint, "location"), (GLdouble, "x"), (GLdouble, "y")]), - GlFunction(Void, "glUniform3d", [(GLint, "location"), (GLdouble, "x"), (GLdouble, "y"), (GLdouble, "z")]), - GlFunction(Void, "glUniform4d", [(GLint, "location"), (GLdouble, "x"), (GLdouble, "y"), (GLdouble, "z"), (GLdouble, "w")]), - GlFunction(Void, "glUniform1dv", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLdouble, "count")), "value")]), - GlFunction(Void, "glUniform2dv", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLdouble, "count")), "value")]), - GlFunction(Void, "glUniform3dv", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLdouble, "count")), "value")]), - GlFunction(Void, "glUniform4dv", [(GLint, "location"), (GLsizei, "count"), (Const(Array(GLdouble, "count")), "value")]), - GlFunction(Void, "glUniformMatrix2dv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), - GlFunction(Void, "glUniformMatrix3dv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), - GlFunction(Void, "glUniformMatrix4dv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), - GlFunction(Void, "glUniformMatrix2x3dv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), - GlFunction(Void, "glUniformMatrix2x4dv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), - GlFunction(Void, "glUniformMatrix3x2dv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), - GlFunction(Void, "glUniformMatrix3x4dv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), - GlFunction(Void, "glUniformMatrix4x2dv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), - GlFunction(Void, "glUniformMatrix4x3dv", [(GLint, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), - GlFunction(Void, "glGetUniformdv", [(GLuint, "program"), (GLint, "location"), Out(OpaqueArray(GLdouble, "__glGetUniformdv_size(location)"), "params")], sideeffects=False), + GlFunction(Void, "glUniform1d", [(GLlocation, "location"), (GLdouble, "x")]), + GlFunction(Void, "glUniform2d", [(GLlocation, "location"), (GLdouble, "x"), (GLdouble, "y")]), + GlFunction(Void, "glUniform3d", [(GLlocation, "location"), (GLdouble, "x"), (GLdouble, "y"), (GLdouble, "z")]), + GlFunction(Void, "glUniform4d", [(GLlocation, "location"), (GLdouble, "x"), (GLdouble, "y"), (GLdouble, "z"), (GLdouble, "w")]), + GlFunction(Void, "glUniform1dv", [(GLlocation, "location"), (GLsizei, "count"), (Const(Array(GLdouble, "count")), "value")]), + GlFunction(Void, "glUniform2dv", [(GLlocation, "location"), (GLsizei, "count"), (Const(Array(GLdouble, "count")), "value")]), + GlFunction(Void, "glUniform3dv", [(GLlocation, "location"), (GLsizei, "count"), (Const(Array(GLdouble, "count")), "value")]), + GlFunction(Void, "glUniform4dv", [(GLlocation, "location"), (GLsizei, "count"), (Const(Array(GLdouble, "count")), "value")]), + GlFunction(Void, "glUniformMatrix2dv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), + GlFunction(Void, "glUniformMatrix3dv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), + GlFunction(Void, "glUniformMatrix4dv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), + GlFunction(Void, "glUniformMatrix2x3dv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), + GlFunction(Void, "glUniformMatrix2x4dv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), + GlFunction(Void, "glUniformMatrix3x2dv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), + GlFunction(Void, "glUniformMatrix3x4dv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), + GlFunction(Void, "glUniformMatrix4x2dv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), + GlFunction(Void, "glUniformMatrix4x3dv", [(GLlocation, "location"), (GLsizei, "count"), (GLboolean, "transpose"), (Const(Array(GLdouble, "count")), "value")]), + GlFunction(Void, "glGetUniformdv", [(GLprogram, "program"), (GLlocation, "location"), Out(OpaqueArray(GLdouble, "__glGetUniformdv_size(location)"), "params")], sideeffects=False), # GL_ARB_shader_subroutine GlFunction(GLint, "glGetSubroutineUniformLocation", [(GLuint, "program"), (GLenum, "shadertype"), (Const(GLstring), "name")], sideeffects=False), -- 2.43.0