diff options
| author | Christoph Bumiller <[email protected]> | 2010-12-19 21:46:33 +0100 |
|---|---|---|
| committer | Christoph Bumiller <[email protected]> | 2010-12-19 21:46:33 +0100 |
| commit | 0f68236a2487dbeb0396b996debcda595b0b54a1 (patch) | |
| tree | 938ae3b779349b6dba6f5a891550604f9a9ca895 /src/mapi/glapi/gen/gl_API.xml | |
| parent | d047168d81cfeb39a98f3ae16416872facc6237c (diff) | |
| parent | 237880463d5168cad8df0bae6018b5fd76617777 (diff) | |
Merge remote branch 'origin/master' into nvc0-new
Diffstat (limited to 'src/mapi/glapi/gen/gl_API.xml')
| -rw-r--r-- | src/mapi/glapi/gen/gl_API.xml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml index bd212c2e4d9..2004647954c 100644 --- a/src/mapi/glapi/gen/gl_API.xml +++ b/src/mapi/glapi/gen/gl_API.xml @@ -11383,7 +11383,7 @@ <function name="ProgramParameters4dvNV" offset="assign"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> - <param name="num" type="GLuint" counter="true"/> + <param name="num" type="GLsizei" counter="true"/> <param name="params" type="const GLdouble *" count="num" count_scale="4"/> <glx rop="4187"/> </function> @@ -11391,7 +11391,7 @@ <function name="ProgramParameters4fvNV" offset="assign"> <param name="target" type="GLenum"/> <param name="index" type="GLuint"/> - <param name="num" type="GLuint" counter="true"/> + <param name="num" type="GLsizei" counter="true"/> <param name="params" type="const GLfloat *" count="num" count_scale="4"/> <glx rop="4186"/> </function> @@ -12519,5 +12519,7 @@ <xi:include href="EXT_texture_integer.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> <xi:include href="EXT_gpu_shader4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<xi:include href="GL3x.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + </OpenGLAPI> |