From 66d24a9ef705b8f9f15dab8059b63781f9fb28ca Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Tue, 12 Nov 2019 13:43:21 +0200 Subject: [PATCH] mesa: allow bit queries for EXT_disjoint_timer_query MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Closes: https://gitlab.freedesktop.org/mesa/mesa/issues/2090 Signed-off-by: Tapani Pälli Reviewed-by: Marek Olšák --- src/mesa/main/queryobj.c | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c index b2740c5ea75..981ccf8f9c0 100644 --- a/src/mesa/main/queryobj.c +++ b/src/mesa/main/queryobj.c @@ -663,11 +663,21 @@ _mesa_GetQueryIndexediv(GLenum target, GLuint index, GLenum pname, * is not CURRENT_QUERY_EXT." * * Same rule is present also in ES 3.2 spec. + * + * EXT_disjoint_timer_query extends this with GL_QUERY_COUNTER_BITS. */ - if (_mesa_is_gles(ctx) && pname != GL_CURRENT_QUERY) { - _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryivEXT(%s)", - _mesa_enum_to_string(pname)); - return; + if (_mesa_is_gles(ctx)) { + switch (pname) { + case GL_CURRENT_QUERY: + break; + case GL_QUERY_COUNTER_BITS: + if (_mesa_has_EXT_disjoint_timer_query(ctx)) + break; + /* fallthrough */ + default: + _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryivEXT(%s)", + _mesa_enum_to_string(pname)); + } } if (target == GL_TIMESTAMP) { -- 2.30.2