diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-13 12:16:00 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-13 12:16:00 +0200 |
| commit | dcf9ae77854778629cabd0d6943dda3678eb91fa (patch) | |
| tree | 087d3bb4beb55bcc0c5857b41d2b5b10edd0e2f3 /mesalib/src/mapi/glapi/gen | |
| parent | 2c8d7aa6bda138693fa1827852ba6b75d1721ff8 (diff) | |
| parent | f0a7d1d88be0c31bd471f4428c4493a93f2d9321 (diff) | |
| download | vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.tar.gz vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.tar.bz2 vcxsrv-dcf9ae77854778629cabd0d6943dda3678eb91fa.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
xorg-server/glx/glxext.c
xorg-server/hw/xwin/InitOutput.c
Diffstat (limited to 'mesalib/src/mapi/glapi/gen')
| -rw-r--r-- | mesalib/src/mapi/glapi/gen/gl_API.xml | 50 |
1 files changed, 48 insertions, 2 deletions
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml index 01460b49b..8bdc47908 100644 --- a/mesalib/src/mapi/glapi/gen/gl_API.xml +++ b/mesalib/src/mapi/glapi/gen/gl_API.xml @@ -8005,7 +8005,36 @@ <xi:include href="ARB_vertex_type_2_10_10_10_rev.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<!-- ARB extensions #86...#94 --> +<!-- ARB extensions #86...#93 --> + +<category name="GL_ARB_transform_feedback3" number="94"> + <enum name="MAX_TRANSFORM_FEEDBACK_BUFFERS" value="0x8E70"/> + <enum name="MAX_VERTEX_STREAMS" value="0x8E71"/> + + <function name="DrawTransformFeedbackStream" offset="assign"> + <param name="mode" type="GLenum"/> + <param name="id" type="GLuint"/> + <param name="stream" type="GLuint"/> + </function> + + <function name="BeginQueryIndexed" offset="assign"> + <param name="target" type="GLenum"/> + <param name="index" type="GLuint"/> + <param name="id" type="GLuint"/> + </function> + + <function name="EndQueryIndexed" offset="assign"> + <param name="target" type="GLenum"/> + <param name="index" type="GLuint"/> + </function> + + <function name="GetQueryIndexediv" offset="assign"> + <param name="target" type="GLenum"/> + <param name="index" type="GLuint"/> + <param name="pname" type="GLenum"/> + <param name="params" type="GLint *"/> + </function> +</category> <xi:include href="ARB_ES2_compatibility.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> @@ -8015,7 +8044,24 @@ <xi:include href="ARB_robustness.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> -<!-- ARB extensions #106...#116 --> +<!-- ARB extensions #106...#108 --> + +<category name="GL_ARB_transform_feedback_instanced" number="109"> + <function name="DrawTransformFeedbackInstanced" offset="assign"> + <param name="mode" type="GLenum"/> + <param name="id" type="GLuint"/> + <param name="primcount" type="GLsizei"/> + </function> + + <function name="DrawTransformFeedbackStreamInstanced" offset="assign"> + <param name="mode" type="GLenum"/> + <param name="id" type="GLuint"/> + <param name="stream" type="GLuint"/> + <param name="primcount" type="GLsizei"/> + </function> +</category> + +<!-- ARB extensions #110...#116 --> <xi:include href="ARB_base_instance.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/> |