diff options
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/r600_blit.c | 17 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 2 |
2 files changed, 5 insertions, 14 deletions
diff --git a/src/gallium/drivers/r600/r600_blit.c b/src/gallium/drivers/r600/r600_blit.c index 09fb6239221..3da583c5d09 100644 --- a/src/gallium/drivers/r600/r600_blit.c +++ b/src/gallium/drivers/r600/r600_blit.c @@ -84,23 +84,16 @@ static void r600_blitter_begin(struct pipe_context *ctx, enum r600_blitter_op op } if ((op & R600_DISABLE_RENDER_COND) && rctx->current_render_cond) { - rctx->saved_render_cond = rctx->current_render_cond; - rctx->saved_render_cond_mode = rctx->current_render_cond_mode; - rctx->context.render_condition(&rctx->context, NULL, 0); - } - + util_blitter_save_render_condition(rctx->blitter, + rctx->current_render_cond, + rctx->current_render_cond_mode); + } } static void r600_blitter_end(struct pipe_context *ctx) { struct r600_context *rctx = (struct r600_context *)ctx; - if (rctx->saved_render_cond) { - rctx->context.render_condition(&rctx->context, - rctx->saved_render_cond, - rctx->saved_render_cond_mode); - rctx->saved_render_cond = NULL; - } - r600_resume_nontimer_queries(rctx); + r600_resume_nontimer_queries(rctx); } static unsigned u_max_layer(struct pipe_resource *r, unsigned level) diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index 68800609979..e66766a9844 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -385,8 +385,6 @@ struct r600_context { struct r600_pipe_state spi; struct pipe_query *current_render_cond; unsigned current_render_cond_mode; - struct pipe_query *saved_render_cond; - unsigned saved_render_cond_mode; /* shader information */ boolean two_side; boolean spi_dirty; |