From: Marek Olšák <maraeo@gmail.com>
Date: Fri, 28 Oct 2011 17:05:44 +0000 (+0200)
Subject: r600g: don't flush before reading query results
X-Git-Tag: mesa-8.0-rc1~1454
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1e1a7011ee8f7e954b9f77985665495e53efae22;p=platform%2Fupstream%2Fmesa.git

r600g: don't flush before reading query results

Taken care of by the winsys.
---

diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c
index e9c6187..a7d7ce6 100644
--- a/src/gallium/drivers/r600/r600_hw_context.c
+++ b/src/gallium/drivers/r600/r600_hw_context.c
@@ -1637,8 +1637,6 @@ void r600_query_begin(struct r600_context *ctx, struct r600_query *query)
 
 	/* collect current results if query buffer is full */
 	if (new_results_end == query->results_start) {
-		if (!query->flushed)
-			r600_context_flush(ctx, 0);
 		r600_query_result(ctx, query, TRUE);
 	}
 
@@ -1817,9 +1815,6 @@ boolean r600_context_query_result(struct r600_context *ctx,
 {
 	uint64_t *result = (uint64_t*)vresult;
 
-	if (!query->flushed) {
-		r600_context_flush(ctx, 0);
-	}
 	if (!r600_query_result(ctx, query, wait))
 		return FALSE;