summaryrefslogtreecommitdiffstats
path: root/src/mesa/drivers/dri
diff options
context:
space:
mode:
authorEric Anholt <[email protected]>2009-08-27 18:34:11 -0700
committerEric Anholt <[email protected]>2009-08-28 15:29:34 -0700
commit446a226f9fb958678dcee892847f1e6ad35151e9 (patch)
tree08381016a860aa67b9d0f53e8f9f4093665d126d /src/mesa/drivers/dri
parent0926a5f4a110926711d0f8a4eb297dc772b09aa2 (diff)
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.
Diffstat (limited to 'src/mesa/drivers/dri')
-rw-r--r--src/mesa/drivers/dri/i965/brw_queryobj.c7
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 cb9169e2eef..f94aa9d0221 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 */