summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTapani Pälli <[email protected]>2017-11-20 08:36:52 +0200
committerTapani Pälli <[email protected]>2017-12-15 08:42:48 +0200
commit0a202dd5e82b6796e919b5f970f8f79622967174 (patch)
treefe2c551b2421a4d18650501ae14512c6ad8522c8
parent80d96ca4c862dcf275b93e603916193094c59d6e (diff)
glapi: add GL_EXT_disjoint_timer_query
Most entrypoints already available via other extensions like GL_EXT_occlusion_query_boolean, GL_EXT_timer_query. Signed-off-by: Tapani Pälli <[email protected]> Reviewed-by: Lionel Landwerlin <[email protected]> Reviewed-by: Ian Romanick <[email protected]>
-rw-r--r--src/mapi/glapi/gen/es_EXT.xml16
-rw-r--r--src/mapi/glapi/gen/gl_API.xml4
-rw-r--r--src/mesa/main/tests/dispatch_sanity.cpp5
3 files changed, 23 insertions, 2 deletions
diff --git a/src/mapi/glapi/gen/es_EXT.xml b/src/mapi/glapi/gen/es_EXT.xml
index f19007366fe..e5104259b62 100644
--- a/src/mapi/glapi/gen/es_EXT.xml
+++ b/src/mapi/glapi/gen/es_EXT.xml
@@ -847,6 +847,22 @@
<enum name="FRAGMENT_SHADER_DISCARDS_SAMPLES_EXT" value="0x8A52"/>
</category>
+<!-- 150. GL_EXT_disjoint_timer_query -->
+<category name="GL_EXT_disjoint_timer_query" number="150">
+ <enum name="QUERY_COUNTER_BITS_EXT" value="0x8864"/>
+ <enum name="CURRENT_QUERY_EXT" value="0x8865"/>
+ <enum name="QUERY_RESULT_EXT" value="0x8866"/>
+ <enum name="QUERY_RESULT_AVAILABLE_EXT" value="0x8867"/>
+ <enum name="TIME_ELAPSED_EXT" value="0x88BF"/>
+ <enum name="TIMESTAMP_EXT" value="0x8E28"/>
+ <enum name="GPU_DISJOINT_EXT" value="0x8FBB"/>
+
+ <function name="QueryCounterEXT" alias="QueryCounter" es2="2.0">
+ <param name="id" type="GLuint"/>
+ <param name="target" type="GLenum"/>
+ </function>
+</category>
+
<!-- 151. GL_EXT_draw_buffers -->
<category name="GL_EXT_draw_buffers" number="151">
<function name="DrawBuffersEXT" alias="DrawBuffers" es2="2.0">
diff --git a/src/mapi/glapi/gen/gl_API.xml b/src/mapi/glapi/gen/gl_API.xml
index d3594cfe195..d13a3bfd83d 100644
--- a/src/mapi/glapi/gen/gl_API.xml
+++ b/src/mapi/glapi/gen/gl_API.xml
@@ -12944,12 +12944,12 @@
<enum name="TIME_ELAPSED_EXT" value="0x88BF"/>
<type name="int64EXT" size="8"/>
<type name="uint64EXT" unsigned="true" size="8"/>
- <function name="GetQueryObjecti64vEXT" alias="GetQueryObjecti64v">
+ <function name="GetQueryObjecti64vEXT" alias="GetQueryObjecti64v" es2="2.0">
<param name="id" type="GLuint"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLint64EXT *"/>
</function>
- <function name="GetQueryObjectui64vEXT" alias="GetQueryObjectui64v">
+ <function name="GetQueryObjectui64vEXT" alias="GetQueryObjectui64v" es2="2.0">
<param name="id" type="GLuint"/>
<param name="pname" type="GLenum"/>
<param name="params" type="GLuint64EXT *"/>
diff --git a/src/mesa/main/tests/dispatch_sanity.cpp b/src/mesa/main/tests/dispatch_sanity.cpp
index 00754deb461..d697343627e 100644
--- a/src/mesa/main/tests/dispatch_sanity.cpp
+++ b/src/mesa/main/tests/dispatch_sanity.cpp
@@ -2441,6 +2441,11 @@ const struct function gles2_functions_possible[] = {
{ "glGetQueryObjectivEXT", 20, -1 },
{ "glGetQueryObjectuivEXT", 20, -1 },
+ /* GL_EXT_disjoint_timer_query */
+ { "glGetQueryObjecti64vEXT", 20, -1 },
+ { "glGetQueryObjectui64vEXT", 20, -1 },
+ { "glQueryCounterEXT", 20, -1 },
+
{ NULL, 0, -1 }
};