Mesa (master): i965: Fix segfault with ARB_oq CheckQuery when results are already fetched.

Eric Anholt anholt at kemper.freedesktop.org
Sat Aug 29 20:30:14 UTC 2009


Module: Mesa
Branch: master
Commit: 3c1172f06636ff4aec24a6c68df937844da73a53
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=3c1172f06636ff4aec24a6c68df937844da73a53

Author: Eric Anholt <eric at anholt.net>
Date:   Sat Aug 29 13:23:58 2009 -0700

i965: Fix segfault with ARB_oq CheckQuery when results are already fetched.

---

 src/mesa/drivers/dri/i965/brw_queryobj.c |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/mesa/drivers/dri/i965/brw_queryobj.c b/src/mesa/drivers/dri/i965/brw_queryobj.c
index f94aa9d..a195bc3 100644
--- a/src/mesa/drivers/dri/i965/brw_queryobj.c
+++ b/src/mesa/drivers/dri/i965/brw_queryobj.c
@@ -148,7 +148,7 @@ static void brw_check_query(GLcontext *ctx, struct gl_query_object *q)
 {
    struct brw_query_object *query = (struct brw_query_object *)q;
 
-   if (!drm_intel_bo_busy(query->bo)) {
+   if (query->bo == NULL || !drm_intel_bo_busy(query->bo)) {
       brw_queryobj_get_results(query);
       query->Base.Ready = GL_TRUE;
    }




More information about the mesa-commit mailing list