Mesa (master): i965: Implement ARB_oq CheckQuery in the intended way.
Eric Anholt
anholt at kemper.freedesktop.org
Fri Aug 28 22:31:06 UTC 2009
Module: Mesa
Branch: master
Commit: 446a226f9fb958678dcee892847f1e6ad35151e9
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=446a226f9fb958678dcee892847f1e6ad35151e9
Author: Eric Anholt <eric at anholt.net>
Date: Thu Aug 27 18:34:11 2009 -0700
i965: Implement ARB_oq CheckQuery in the intended way.
Previously we blocked because I hadn't added the libdrm function. Now it's
there, so update your libdrm.
---
src/mesa/drivers/dri/i965/brw_queryobj.c | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/src/mesa/drivers/dri/i965/brw_queryobj.c b/src/mesa/drivers/dri/i965/brw_queryobj.c
index cb9169e..f94aa9d 100644
--- a/src/mesa/drivers/dri/i965/brw_queryobj.c
+++ b/src/mesa/drivers/dri/i965/brw_queryobj.c
@@ -146,17 +146,12 @@ static void brw_wait_query(GLcontext *ctx, struct gl_query_object *q)
static void brw_check_query(GLcontext *ctx, struct gl_query_object *q)
{
- /* XXX: Need to expose dri_bo_is_idle from bufmgr. */
-#if 0
struct brw_query_object *query = (struct brw_query_object *)q;
- if (dri_bo_is_idle(query->bo)) {
+ if (!drm_intel_bo_busy(query->bo)) {
brw_queryobj_get_results(query);
query->Base.Ready = GL_TRUE;
}
-#else
- brw_wait_query(ctx, q);
-#endif
}
/** Called to set up the query BO and account for its aperture space */
More information about the mesa-commit
mailing list