diff options
| author | Christian König <[email protected]> | 2010-11-21 19:40:52 +0100 |
|---|---|---|
| committer | Christian König <[email protected]> | 2010-11-21 19:40:52 +0100 |
| commit | e6b71530daea3059ee362d4df51575e27e026b22 (patch) | |
| tree | 8df01693aa4bf44360647d79a340cbb4156aa91a /src/mapi/glapi/gen/gl_API.xml | |
| parent | 42c7291d2cb50c2bd94dd9346a8402a24303d66d (diff) | |
| parent | 5e3733fadf08178fca7c9f20a0f4783f940383aa (diff) | |
Merge remote branch 'origin/master' into pipe-video
Conflicts:
src/gallium/auxiliary/Makefile
src/gallium/auxiliary/SConscript
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> |