From: Brian Paul <brianp@vmware.com>
Date: Wed, 17 Feb 2010 15:27:53 +0000 (-0700)
Subject: st/mesa: replace conditional with assertion
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=6b4a553dd34764f8c696ae8198d98efbb28bbc93;p=mesa.git

st/mesa: replace conditional with assertion

Core Mesa will not call ctx->Driver.CheckQuery() if the Ready flag
is already set.
---

diff --git a/src/mesa/state_tracker/st_cb_queryobj.c b/src/mesa/state_tracker/st_cb_queryobj.c
index 2281d10e999..dc40c5d269d 100644
--- a/src/mesa/state_tracker/st_cb_queryobj.c
+++ b/src/mesa/state_tracker/st_cb_queryobj.c
@@ -130,13 +130,8 @@ st_CheckQuery(GLcontext *ctx, struct gl_query_object *q)
 {
    struct pipe_context *pipe = ctx->st->pipe;
    struct st_query_object *stq = st_query_object(q);
-
-   if (!q->Ready) {
-      q->Ready = pipe->get_query_result(pipe, 
-					stq->pq,
-					FALSE,
-					&q->Result);
-   }
+   assert(!q->Ready);   /* we should not get called if Ready is TRUE */
+   q->Ready = pipe->get_query_result(pipe, stq->pq, FALSE, &q->Result);
 }