diff options
| author | Tapani Pälli <[email protected]> | 2019-11-14 14:50:30 +0200 |
|---|---|---|
| committer | Tapani Pälli <[email protected]> | 2019-11-14 13:34:33 +0000 |
| commit | 94cb4916e3832d61c8899afeb2ec007e1075ded1 (patch) | |
| tree | eb46864a62e609257039a272b8a2dcb2a12fae03 /src/mesa | |
| parent | f9fd04aca15fd00889caa666ba38007268e67f5c (diff) | |
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.
Diffstat (limited to 'src/mesa')
| -rw-r--r-- | src/mesa/main/queryobj.c | 18 |
1 files 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, * <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) { |