diff options
| author | Marek Olšák <[email protected]> | 2018-04-01 15:03:23 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-04-05 15:34:58 -0400 |
| commit | f7de8686de823f523ee53f354063d313f9dcecbe (patch) | |
| tree | 0ed41c6c19c00bdb19d206312336ac1aebb54565 | |
| parent | 4598ad6a008b535d5b39e0b2727883818afbf571 (diff) | |
radeonsi: remove r600_ring::flush callback
Acked-by: Timothy Arceri <[email protected]>
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.c | 1 | ||||
| -rw-r--r-- | src/gallium/drivers/radeon/r600_pipe_common.h | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_fence.c | 6 | ||||
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_pipe.c | 1 |
4 files changed, 3 insertions, 7 deletions
diff --git a/src/gallium/drivers/radeon/r600_pipe_common.c b/src/gallium/drivers/radeon/r600_pipe_common.c index bd35aa82d67..f09770ddcca 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.c +++ b/src/gallium/drivers/radeon/r600_pipe_common.c @@ -177,7 +177,6 @@ bool si_common_context_init(struct r600_common_context *rctx, rctx->dma.cs = rctx->ws->cs_create(rctx->ctx, RING_DMA, si_flush_dma_cs, rctx); - rctx->dma.flush = si_flush_dma_cs; } return true; diff --git a/src/gallium/drivers/radeon/r600_pipe_common.h b/src/gallium/drivers/radeon/r600_pipe_common.h index 813047fabbc..ab9450b7b01 100644 --- a/src/gallium/drivers/radeon/r600_pipe_common.h +++ b/src/gallium/drivers/radeon/r600_pipe_common.h @@ -370,8 +370,6 @@ struct r600_atom { struct r600_ring { struct radeon_winsys_cs *cs; - void (*flush)(void *ctx, unsigned flags, - struct pipe_fence_handle **fence); }; /* Saved CS data for debugging features. */ diff --git a/src/gallium/drivers/radeonsi/si_fence.c b/src/gallium/drivers/radeonsi/si_fence.c index 3b437091b1e..cd8a88bf3aa 100644 --- a/src/gallium/drivers/radeonsi/si_fence.c +++ b/src/gallium/drivers/radeonsi/si_fence.c @@ -376,7 +376,7 @@ static boolean si_fence_finish(struct pipe_screen *screen, * not going to wait. */ threaded_context_unwrap_sync(ctx); - sctx->b.gfx.flush(&sctx->b, timeout ? 0 : PIPE_FLUSH_ASYNC, NULL); + si_flush_gfx_cs(&sctx->b, timeout ? 0 : PIPE_FLUSH_ASYNC, NULL); rfence->gfx_unflushed.ctx = NULL; if (!timeout) @@ -516,7 +516,7 @@ static void si_flush_from_st(struct pipe_context *ctx, /* DMA IBs are preambles to gfx IBs, therefore must be flushed first. */ if (rctx->dma.cs) - rctx->dma.flush(rctx, rflags, fence ? &sdma_fence : NULL); + si_flush_dma_cs(rctx, rflags, fence ? &sdma_fence : NULL); if (!radeon_emitted(rctx->gfx.cs, rctx->initial_gfx_cs_size)) { if (fence) @@ -536,7 +536,7 @@ static void si_flush_from_st(struct pipe_context *ctx, gfx_fence = rctx->ws->cs_get_next_fence(rctx->gfx.cs); deferred_fence = true; } else { - rctx->gfx.flush(rctx, rflags, fence ? &gfx_fence : NULL); + si_flush_gfx_cs(rctx, rflags, fence ? &gfx_fence : NULL); } } diff --git a/src/gallium/drivers/radeonsi/si_pipe.c b/src/gallium/drivers/radeonsi/si_pipe.c index 21b97437618..8411a822314 100644 --- a/src/gallium/drivers/radeonsi/si_pipe.c +++ b/src/gallium/drivers/radeonsi/si_pipe.c @@ -287,7 +287,6 @@ static struct pipe_context *si_create_context(struct pipe_screen *screen, sctx->b.gfx.cs = ws->cs_create(sctx->b.ctx, RING_GFX, si_flush_gfx_cs, sctx); - sctx->b.gfx.flush = si_flush_gfx_cs; /* Border colors. */ sctx->border_color_table = malloc(SI_MAX_BORDER_COLORS * |