summaryrefslogtreecommitdiffstats
path: root/src/mesa/main/queryobj.c
diff options
context:
space:
mode:
authorTapani Pälli <[email protected]>2017-12-12 14:46:13 +0200
committerTapani Pälli <[email protected]>2017-12-15 08:42:48 +0200
commit33f73345da01a70aa0e5d61069508e169cb6a6ed (patch)
treeeda993eebaeee58b75d6742a8c6b61945efc4351 /src/mesa/main/queryobj.c
parent0a202dd5e82b6796e919b5f970f8f79622967174 (diff)
mesa: GL_EXT_disjoint_timer_query extension API bits
Patch adds GL_GPU_DISJOINT_EXT and enables to use timer queries when EXT_disjoint_timer_query is enabled. v2: enable extension only when EXT_disjoint_timer_query set Signed-off-by: Tapani Pälli <[email protected]> Reviewed-by: Lionel Landwerlin <[email protected]> (v1) Reviewed-by: Ian Romanick <[email protected]>
Diffstat (limited to 'src/mesa/main/queryobj.c')
-rw-r--r--src/mesa/main/queryobj.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c
index d966814a768..79600d7db19 100644
--- a/src/mesa/main/queryobj.c
+++ b/src/mesa/main/queryobj.c
@@ -822,7 +822,8 @@ get_query_object(struct gl_context *ctx, const char *func,
if (buf && buf != ctx->Shared->NullBufferObj) {
bool is_64bit = ptype == GL_INT64_ARB ||
ptype == GL_UNSIGNED_INT64_ARB;
- if (!ctx->Extensions.ARB_query_buffer_object) {
+ if (!ctx->Extensions.ARB_query_buffer_object &&
+ !ctx->Extensions.EXT_disjoint_timer_query) {
_mesa_error(ctx, GL_INVALID_OPERATION, "%s(not supported)", func);
return;
}