From: Eric Anholt <eric@anholt.net>
Date: Fri, 28 Aug 2009 01:34:11 +0000 (-0700)
Subject: i965: Implement ARB_oq CheckQuery in the intended way.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=446a226f9fb958678dcee892847f1e6ad35151e9;p=mesa.git

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.
---

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 */