Mesa (master): r300g: cleanup render_condition a bit
Marek Olšák
mareko at kemper.freedesktop.org
Sun May 29 03:16:08 UTC 2011
Module: Mesa
Branch: master
Commit: d18792f93d6dcdf7ef971522bdfba1ceeb0c6668
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=d18792f93d6dcdf7ef971522bdfba1ceeb0c6668
Author: Marek Olšák <maraeo at gmail.com>
Date: Sun May 29 03:59:07 2011 +0200
r300g: cleanup render_condition a bit
---
src/gallium/drivers/r300/r300_query.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/src/gallium/drivers/r300/r300_query.c b/src/gallium/drivers/r300/r300_query.c
index 55a2e2f..782f041 100644
--- a/src/gallium/drivers/r300/r300_query.c
+++ b/src/gallium/drivers/r300/r300_query.c
@@ -156,17 +156,15 @@ static void r300_render_condition(struct pipe_context *pipe,
uint64_t result = 0;
boolean wait;
+ r300->skip_rendering = FALSE;
+
if (query) {
wait = mode == PIPE_RENDER_COND_WAIT ||
mode == PIPE_RENDER_COND_BY_REGION_WAIT;
- if (!r300_get_query_result(pipe, query, wait, &result)) {
- r300->skip_rendering = FALSE;
- } else {
+ if (r300_get_query_result(pipe, query, wait, &result)) {
r300->skip_rendering = result == 0;
}
- } else {
- r300->skip_rendering = FALSE;
}
}
More information about the mesa-commit
mailing list