summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Paul <brianp@vmware.com>2010-02-17 08:27:53 -0700
committerBrian Paul <brianp@vmware.com>2010-02-17 08:29:01 -0700
commit6b4a553dd34764f8c696ae8198d98efbb28bbc93 (patch)
tree940fcc597b5631ae9e56568b29483fda8f147def
parentf4542477cfca8f78de7ac14ad7f431ac6454f45b (diff)
st/mesa: replace conditional with assertion
Core Mesa will not call ctx->Driver.CheckQuery() if the Ready flag is already set.
-rw-r--r--src/mesa/state_tracker/st_cb_queryobj.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mesa/state_tracker/st_cb_queryobj.c b/src/mesa/state_tracker/st_cb_queryobj.c
index 2281d10e99..dc40c5d269 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);
}