From 2c5f2936af642d8e4510154395215915c46b3fbb Mon Sep 17 00:00:00 2001 From: Marek Olšák Date: Tue, 28 Nov 2017 17:54:55 +0100 Subject: r300,r600,radeonsi: replace RADEON_FLUSH_* with PIPE_FLUSH_* MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit and handle PIPE_FLUSH_HINT_FINISH in r300. Reviewed-by: Nicolai Hähnle --- src/gallium/drivers/r300/r300_blit.c | 2 +- src/gallium/drivers/r300/r300_flush.c | 7 ++++--- src/gallium/drivers/r300/r300_query.c | 2 +- src/gallium/drivers/r300/r300_render.c | 2 +- 4 files changed, 7 insertions(+), 6 deletions(-) (limited to 'src/gallium/drivers/r300') diff --git a/src/gallium/drivers/r300/r300_blit.c b/src/gallium/drivers/r300/r300_blit.c index 8fda727f351..bc497757a93 100644 --- a/src/gallium/drivers/r300/r300_blit.c +++ b/src/gallium/drivers/r300/r300_blit.c @@ -383,7 +383,7 @@ static void r300_clear(struct pipe_context* pipe, /* Reserve CS space. */ if (!r300->rws->cs_check_space(r300->cs, dwords)) { - r300_flush(&r300->context, RADEON_FLUSH_ASYNC, NULL); + r300_flush(&r300->context, PIPE_FLUSH_ASYNC, NULL); } /* Emit clear packets. */ diff --git a/src/gallium/drivers/r300/r300_flush.c b/src/gallium/drivers/r300/r300_flush.c index 7fabd13f3d7..f6c1bf32ca2 100644 --- a/src/gallium/drivers/r300/r300_flush.c +++ b/src/gallium/drivers/r300/r300_flush.c @@ -129,9 +129,10 @@ static void r300_flush_wrapped(struct pipe_context *pipe, struct pipe_fence_handle **fence, unsigned flags) { - r300_flush(pipe, - flags & PIPE_FLUSH_END_OF_FRAME ? RADEON_FLUSH_END_OF_FRAME : 0, - fence); + if (flags & PIPE_FLUSH_HINT_FINISH) + flags &= ~PIPE_FLUSH_ASYNC; + + r300_flush(pipe, flags, fence); } void r300_init_flush_functions(struct r300_context* r300) diff --git a/src/gallium/drivers/r300/r300_query.c b/src/gallium/drivers/r300/r300_query.c index a84c941768f..014055b221e 100644 --- a/src/gallium/drivers/r300/r300_query.c +++ b/src/gallium/drivers/r300/r300_query.c @@ -121,7 +121,7 @@ static bool r300_end_query(struct pipe_context* pipe, if (q->type == PIPE_QUERY_GPU_FINISHED) { pb_reference(&q->buf, NULL); - r300_flush(pipe, RADEON_FLUSH_ASYNC, + r300_flush(pipe, PIPE_FLUSH_ASYNC, (struct pipe_fence_handle**)&q->buf); return true; } diff --git a/src/gallium/drivers/r300/r300_render.c b/src/gallium/drivers/r300/r300_render.c index 9397aaeba7c..211d35d0607 100644 --- a/src/gallium/drivers/r300/r300_render.c +++ b/src/gallium/drivers/r300/r300_render.c @@ -216,7 +216,7 @@ static boolean r300_reserve_cs_dwords(struct r300_context *r300, /* Reserve requested CS space. */ if (!r300->rws->cs_check_space(r300->cs, cs_dwords)) { - r300_flush(&r300->context, RADEON_FLUSH_ASYNC, NULL); + r300_flush(&r300->context, PIPE_FLUSH_ASYNC, NULL); flushed = TRUE; } -- cgit v1.2.3