aboutsummaryrefslogtreecommitdiff
path: root/mesalib/src/mapi/glapi
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-07-11 11:56:57 +0200
committermarha <marha@users.sourceforge.net>2012-07-11 11:56:57 +0200
commit0bef135026040688be97af98cc99cc82f93838e8 (patch)
treee92b0a40e98bbd566e64ac507a5b3d2acf397c7b /mesalib/src/mapi/glapi
parentd137057fd13e83ec15ab416c7fe774741da06047 (diff)
downloadvcxsrv-0bef135026040688be97af98cc99cc82f93838e8.tar.gz
vcxsrv-0bef135026040688be97af98cc99cc82f93838e8.tar.bz2
vcxsrv-0bef135026040688be97af98cc99cc82f93838e8.zip
mesa xserver pixman git update 11 Jul 2012
Diffstat (limited to 'mesalib/src/mapi/glapi')
-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 af74c909b..c302ab94a 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"/>