From 94cb4916e3832d61c8899afeb2ec007e1075ded1 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tapani=20P=C3=A4lli?= Date: Thu, 14 Nov 2019 14:50:30 +0200 Subject: [PATCH] Revert "mesa: allow bit queries for EXT_disjoint_timer_query" This reverts commit 66d24a9ef705b8f9f15dab8059b63781f9fb28ca. This commit made Mesa CI red because commit depends on a Piglit test change. --- src/mesa/main/queryobj.c | 18 ++++-------------- 1 file changed, 4 insertions(+), 14 deletions(-) diff --git a/src/mesa/main/queryobj.c b/src/mesa/main/queryobj.c index 981ccf8f9c0..b2740c5ea75 100644 --- a/src/mesa/main/queryobj.c +++ b/src/mesa/main/queryobj.c @@ -663,21 +663,11 @@ _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)) { - 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 (_mesa_is_gles(ctx) && pname != GL_CURRENT_QUERY) { + _mesa_error(ctx, GL_INVALID_ENUM, "glGetQueryivEXT(%s)", + _mesa_enum_to_string(pname)); + return; } if (target == GL_TIMESTAMP) { -- 2.30.2