fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-02 23:09:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Revert "mesa: allow bit queries for EXT_disjoint_timer_query"

Browse source 
This reverts commit 66d24a9ef7.

This commit made Mesa CI red because commit depends on a Piglit test
change.
This commit is contained in:
Tapani Pälli 2019-11-14 14:50:30 +02:00
parent f9fd04aca1
commit 94cb4916e3
1 changed files with 4 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/mesa/main/queryobj.c
View file

@ -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) {