aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-07-11 12:00:44 +0200
committermarha <marha@users.sourceforge.net>2012-07-11 12:00:44 +0200
commitdb967c2b0fd8506b9e1cf7574d5fb927bec786c5 (patch)
tree5444de1e304af7b5ae8c4b590a08b1b5964c7eca /mesalib/src/mapi
parent6cab6b3ebc8ed1a81ced93d621ea3abf05e282ab (diff)
parent0bef135026040688be97af98cc99cc82f93838e8 (diff)
downloadvcxsrv-db967c2b0fd8506b9e1cf7574d5fb927bec786c5.tar.gz
vcxsrv-db967c2b0fd8506b9e1cf7574d5fb927bec786c5.tar.bz2
vcxsrv-db967c2b0fd8506b9e1cf7574d5fb927bec786c5.zip
Merge remote-tracking branch 'origin/released'
Conflicts: xorg-server/dix/devices.c
Diffstat (limited to 'mesalib/src/mapi')
-rw-r--r--mesalib/src/mapi/glapi/gen/gl_API.xml22
1 files changed, 21 insertions, 1 deletions
diff --git a/mesalib/src/mapi/glapi/gen/gl_API.xml b/mesalib/src/mapi/glapi/gen/gl_API.xml
index bcc2f5c2c..01460b49b 100644
--- a/mesalib/src/mapi/glapi/gen/gl_API.xml
+++ b/mesalib/src/mapi/glapi/gen/gl_API.xml
@@ -7981,7 +7981,27 @@
<xi:include href="ARB_texture_rgb10_a2ui.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>
<!-- 84. GL_ARB_texture_swizzle -->
-<!-- 85. GL_ARB_timer_query -->
+
+<category name="GL_ARB_timer_query" number="85">
+ <enum name="TIME_ELAPSED" value="0x88BF"/>
+ <enum name="TIMESTAMP" value="0x8E28"/>
+ <type name="int64" size="8"/>
+ <type name="uint64" unsigned="true" size="8"/>
+ <function name="GetQueryObjecti64v" alias="GetQueryObjecti64vEXT" static_dispatch="false">
+ <param name="id" type="GLuint"/>
+ <param name="pname" type="GLenum"/>
+ <param name="params" type="GLint64 *"/>
+ </function>
+ <function name="GetQueryObjectui64v" alias="GetQueryObjectui64vEXT" static_dispatch="false">
+ <param name="id" type="GLuint"/>
+ <param name="pname" type="GLenum"/>
+ <param name="params" type="GLuint64 *"/>
+ </function>
+ <function name="QueryCounter" offset="assign" static_dispatch="false">
+ <param name="id" type="GLuint"/>
+ <param name="target" type="GLenum"/>
+ </function>
+</category>
<xi:include href="ARB_vertex_type_2_10_10_10_rev.xml" xmlns:xi="http://www.w3.org/2001/XInclude"/>