st/mesa: replace conditional with assertion
authorBrian Paul <brianp@vmware.com>
Wed, 17 Feb 2010 15:27:53 +0000 (08:27 -0700)
committerBrian Paul <brianp@vmware.com>
Wed, 17 Feb 2010 15:29:01 +0000 (08:29 -0700)
Core Mesa will not call ctx->Driver.CheckQuery() if the Ready flag
is already set.

src/mesa/state_tracker/st_cb_queryobj.c

index 2281d10e99960c5b4c3f9f9792dac628a151ffb0..dc40c5d269d77c04fbe7fa1c37df6ca13d5575c1 100644 (file)
@@ -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);
 }