From d4edc607670e37138f7a804ba208cf91acd9d0f1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marek=20Ol=C5=A1=C3=A1k?= Date: Sat, 12 Apr 2014 17:34:44 +0200 Subject: radeonsi: merge si_flush with si_context_flush MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This also removes si_flush_gfx_ring. Reviewed-by: Christian König --- src/gallium/drivers/radeon/r600_pipe_common.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/gallium/drivers/radeon') diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index 36a4fb1..a87efdc 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, -- cgit v1.1