diff options
Diffstat (limited to 'src/gallium/drivers/r600')
| -rw-r--r-- | src/gallium/drivers/r600/r600_hw_context.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.h | 3 |
3 files changed, 1 insertions, 6 deletions
diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c index b6375c25f8c..1d6d99740db 100644 --- a/src/gallium/drivers/r600/r600_hw_context.c +++ b/src/gallium/drivers/r600/r600_hw_context.c @@ -957,7 +957,7 @@ void r600_need_cs_space(struct r600_context *ctx, unsigned num_dw, /* Flush if there's not enough space. */ if (num_dw > RADEON_MAX_CMDBUF_DWORDS) { - ctx->flush(ctx->pipe, RADEON_FLUSH_ASYNC); + r600_flush(&ctx->context, NULL, RADEON_FLUSH_ASYNC); } } diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index d61855d7498..bd68eff8f73 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -259,8 +259,6 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void return NULL; } - rctx->pipe = &rctx->context; - rctx->flush = r600_flush_from_winsys; rctx->ws->cs_set_flush_callback(rctx->cs, r600_flush_from_winsys, rctx); util_slab_create(&rctx->pool_transfers, diff --git a/src/gallium/drivers/r600/r600_pipe.h b/src/gallium/drivers/r600/r600_pipe.h index 41ea38d86fa..5ed07cb74e2 100644 --- a/src/gallium/drivers/r600/r600_pipe.h +++ b/src/gallium/drivers/r600/r600_pipe.h @@ -254,9 +254,6 @@ struct r600_context { /* Below are variables from the old r600_context. */ struct radeon_winsys_cs *cs; - struct pipe_context *pipe; - - void (*flush)(void *pipe, unsigned flags); struct r600_range *range; unsigned nblocks; |