diff options
| author | Marek Olšák <[email protected]> | 2011-11-10 18:42:10 +0100 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2011-11-10 18:48:23 +0100 |
| commit | ec3d2c7f089e0a4750dc42f10da914b58858499e (patch) | |
| tree | 0ebbb830202bf0ee3d0f66eac5341fcf768eabde /src/gallium | |
| parent | 6a490149d9b8b77ead81b4227f2860ec22095217 (diff) | |
r600g: flush the whole context when CS is full, not just hw_context
Because we disable render condition in r600_flush, but not in r600_context_flush.
Diffstat (limited to 'src/gallium')
| -rw-r--r-- | src/gallium/drivers/r600/r600.h | 3 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_hw_context.c | 2 | ||||
| -rw-r--r-- | src/gallium/drivers/r600/r600_pipe.c | 2 |
3 files changed, 6 insertions, 1 deletions
diff --git a/src/gallium/drivers/r600/r600.h b/src/gallium/drivers/r600/r600.h index 5bd808ace4d..28c1ee15ce3 100644 --- a/src/gallium/drivers/r600/r600.h +++ b/src/gallium/drivers/r600/r600.h @@ -192,6 +192,9 @@ struct r600_context { struct r600_screen *screen; struct radeon_winsys *ws; struct radeon_winsys_cs *cs; + struct pipe_context *pipe; + + void (*flush)(void *pipe, unsigned flags); struct r600_range *range; unsigned nblocks; diff --git a/src/gallium/drivers/r600/r600_hw_context.c b/src/gallium/drivers/r600/r600_hw_context.c index 3a0cde39462..905ea85c399 100644 --- a/src/gallium/drivers/r600/r600_hw_context.c +++ b/src/gallium/drivers/r600/r600_hw_context.c @@ -956,7 +956,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) { - r600_context_flush(ctx, RADEON_FLUSH_ASYNC); + ctx->flush(ctx->pipe, RADEON_FLUSH_ASYNC); } } diff --git a/src/gallium/drivers/r600/r600_pipe.c b/src/gallium/drivers/r600/r600_pipe.c index dcfcd662440..243de140789 100644 --- a/src/gallium/drivers/r600/r600_pipe.c +++ b/src/gallium/drivers/r600/r600_pipe.c @@ -272,6 +272,8 @@ static struct pipe_context *r600_create_context(struct pipe_screen *screen, void return NULL; } + rctx->ctx.pipe = &rctx->context; + rctx->ctx.flush = r600_flush_from_winsys; rctx->ws->cs_set_flush_callback(rctx->ctx.cs, r600_flush_from_winsys, rctx); util_slab_create(&rctx->pool_transfers, |