Mesa (master): r600g: reset the render condition to NULL when rendering unconditionally

[Marek Olšák]

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

Author: Marek Olšák <maraeo at gmail.com>
Date:   Sat Oct 29 16:19:45 2011 +0200

r600g: reset the render condition to NULL when rendering unconditionally

---

 src/gallium/drivers/r600/r600_query.c |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/r600/r600_query.c b/src/gallium/drivers/r600/r600_query.c
index a632ef4..afdb038 100644
--- a/src/gallium/drivers/r600/r600_query.c
+++ b/src/gallium/drivers/r600/r600_query.c
@@ -76,8 +76,12 @@ static void r600_render_condition(struct pipe_context *ctx,
 	int wait_flag = 0;
 
 	/* If we already have nonzero result, render unconditionally */
-	if (query != NULL && rquery->result != 0)
+	if (query != NULL && rquery->result != 0) {
+		if (rctx->current_render_cond) {
+			r600_render_condition(ctx, NULL, 0);
+		}
 		return;
+	}
 
 	rctx->current_render_cond = query;
 	rctx->current_render_cond_mode = mode;