From: Marek Olšák <maraeo@gmail.com>
Date: Sat, 29 Oct 2011 14:19:45 +0000 (+0200)
Subject: r600g: reset the render condition to NULL when rendering unconditionally
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9eac0fce83c88bedfc6d1c9a653c393d2be4b655;p=mesa.git

r600g: reset the render condition to NULL when rendering unconditionally
---

diff --git a/src/gallium/drivers/r600/r600_query.c b/src/gallium/drivers/r600/r600_query.c
index a632ef4615b..afdb0382d37 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;