summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r300/r300_query.c
diff options
context:
space:
mode:
authorMarek Olšák <maraeo@gmail.com>2011-05-29 03:59:07 +0200
committerMarek Olšák <maraeo@gmail.com>2011-05-29 05:15:27 +0200
commitd18792f93d6dcdf7ef971522bdfba1ceeb0c6668 (patch)
tree84e16f3f02297415cc48107d649f41499353f85a /src/gallium/drivers/r300/r300_query.c
parent70b86fb273ee9c3b6fea750bc14eae43328ba677 (diff)
downloadexternal_mesa3d-d18792f93d6dcdf7ef971522bdfba1ceeb0c6668.zip
external_mesa3d-d18792f93d6dcdf7ef971522bdfba1ceeb0c6668.tar.gz
external_mesa3d-d18792f93d6dcdf7ef971522bdfba1ceeb0c6668.tar.bz2
r300g: cleanup render_condition a bit
Diffstat (limited to 'src/gallium/drivers/r300/r300_query.c')
-rw-r--r--src/gallium/drivers/r300/r300_query.c8
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;
}
}