Mesa (master): Revert "etnaviv: Fake occlusion query capability"
Christian Gmeiner
austriancoder at kemper.freedesktop.org
Wed Jan 18 16:39:38 UTC 2017
Module: Mesa
Branch: master
Commit: 65a44a76fc076c4127c0c7b07fb38891e61ea400
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=65a44a76fc076c4127c0c7b07fb38891e61ea400
Author: Christian Gmeiner <christian.gmeiner at gmail.com>
Date: Wed Jan 18 17:32:51 2017 +0100
Revert "etnaviv: Fake occlusion query capability"
This reverts commit b7ac0f567123c96b5cd9e3485b963a5c0a0db66a.
This is a half baked solution needs some rework to fixes issues
with reported counter bits (GL_QUERY_COUNTER_BITS_ARB).
Also it enables PIPE_CAP_QUERY_TIME_ELAPSED accidently.
Signed-off-by: Christian Gmeiner <christian.gmeiner at gmail.com>
---
src/gallium/drivers/etnaviv/etnaviv_screen.c | 5 ++---
1 file changed, 2 insertions(+), 3 deletions(-)
diff --git a/src/gallium/drivers/etnaviv/etnaviv_screen.c b/src/gallium/drivers/etnaviv/etnaviv_screen.c
index bf66168..fa76226 100644
--- a/src/gallium/drivers/etnaviv/etnaviv_screen.c
+++ b/src/gallium/drivers/etnaviv/etnaviv_screen.c
@@ -292,10 +292,9 @@ etna_screen_get_param(struct pipe_screen *pscreen, enum pipe_cap param)
return 1;
/* Timer queries. */
- case PIPE_CAP_OCCLUSION_QUERY: /* Not implemented - fake it for OpenGL2 */
- return 1;
-
case PIPE_CAP_QUERY_TIME_ELAPSED:
+ case PIPE_CAP_OCCLUSION_QUERY:
+ return 0;
case PIPE_CAP_QUERY_TIMESTAMP:
return 1;
case PIPE_CAP_QUERY_PIPELINE_STATISTICS:
More information about the mesa-commit
mailing list