diff options
author | marha <marha@users.sourceforge.net> | 2010-11-29 22:05:53 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-11-29 22:05:53 +0000 |
commit | fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7 (patch) | |
tree | fa1ba494685a71e28a096990a8707680c7cb378b /mesalib/src/mapi/glapi/gen/gl_API.xml | |
parent | ae340911c1ba1f98b418bd8f1a487fa4d79491b0 (diff) | |
parent | 6fda93be42ace9eeab0e82ceebb6798961c9105c (diff) | |
download | vcxsrv-fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7.tar.gz vcxsrv-fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7.tar.bz2 vcxsrv-fed109d6a33c0871291d1bb2f3f6b7a3d1a3e9d7.zip |
svn merge ^/branches/released .
Diffstat (limited to 'mesalib/src/mapi/glapi/gen/gl_API.xml')
-rw-r--r-- | mesalib/src/mapi/glapi/gen/gl_API.xml | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index 3e2981b91..123565458 100644 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml @@ -4666,8 +4666,8 @@ <function name="MultiDrawArrays" alias="MultiDrawArraysEXT"> <param name="mode" type="GLenum"/> - <param name="first" type="GLint *"/> <!-- Spec bug. Should be const. --> - <param name="count" type="GLsizei *"/> <!-- Spec bug. Should be const. --> + <param name="first" type="const GLint *"/> + <param name="count" type="const GLsizei *"/> <param name="primcount" type="GLsizei"/> </function> @@ -7967,6 +7967,12 @@ <xi:include href="NV_conditional_render.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> +<xi:include href="EXT_transform_feedback.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + +<xi:include href="ARB_draw_instanced.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + +<xi:include href="ARB_geometry_shader4.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> + <!-- Non-ARB extensions sorted by extension number. --> @@ -9788,8 +9794,8 @@ <category name="GL_EXT_multi_draw_arrays" number="148"> <function name="MultiDrawArraysEXT" offset="assign"> <param name="mode" type="GLenum"/> - <param name="first" type="GLint *"/> <!-- Spec bug. Should be const. --> - <param name="count" type="GLsizei *"/> <!-- Spec bug. Should be const. --> + <param name="first" type="const GLint *"/> + <param name="count" type="const GLsizei *"/> <param name="primcount" type="GLsizei"/> <glx handcode="true"/> </function> |