summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/r600
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2011-10-29 16:19:45 +0200
committerMarek Olšák <[email protected]>2011-10-30 02:25:51 +0200
commit9eac0fce83c88bedfc6d1c9a653c393d2be4b655 (patch)
tree5cdfa0f22a3e47a233292cfee009f3a968df33a8 /src/gallium/drivers/r600
parentb40edc63d7d272ac132fded52f3119f4780c7e6b (diff)
r600g: reset the render condition to NULL when rendering unconditionally
Diffstat (limited to 'src/gallium/drivers/r600')
-rw-r--r--src/gallium/drivers/r600/r600_query.c6
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 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;