summaryrefslogtreecommitdiffstats
path: root/src/gallium/drivers/radeon
diff options
context:
space:
mode:
authorMarek Olšák <[email protected]>2014-04-12 17:34:44 +0200
committerMarek Olšák <[email protected]>2014-04-16 14:02:51 +0200
commitd4edc607670e37138f7a804ba208cf91acd9d0f1 (patch)
tree226b9d086b89b369bdd01a2e243bb2114d2cd97e /src/gallium/drivers/radeon
parent70cf6639c331342619e65c46db925d115bf51920 (diff)
radeonsi: merge si_flush with si_context_flush
This also removes si_flush_gfx_ring. Reviewed-by: Christian König <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeon')
-rw-r--r--src/gallium/drivers/radeon/r600_pipe_common.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h
index 36a4fb1f6aa..a87efdcbdae 100644
--- a/src/gallium/drivers/radeon/r600_pipe_common.h
+++ b/src/gallium/drivers/radeon/r600_pipe_common.h
@@ -352,6 +352,10 @@ struct r600_common_context {
unsigned current_render_cond_mode;
boolean current_render_cond_cond;
boolean predicate_drawing;
+ /* For context flushing. */
+ struct pipe_query *saved_render_cond;
+ boolean saved_render_cond_cond;
+ unsigned saved_render_cond_mode;
/* Copy one resource to another using async DMA. */
void (*dma_copy)(struct pipe_context *ctx,