diff options
author | Marek Olšák <[email protected]> | 2012-02-26 18:04:36 +0100 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2012-03-05 14:22:25 +0100 |
commit | 29e55bc5f1b6d7375b6a86e24ca4ae58e399011e (patch) | |
tree | 2ea897849a6dab0f9257e8649c682451152e81c1 /src/gallium/drivers | |
parent | 96ef4ddc3ddda4d1f637af86f4790d24f8f386c6 (diff) |
winsys/radeon: add usage parameter to cs_is_buffer_referenced
Reviewed-by: Alex Deucher <[email protected]>
Reviewed-by: Christian König <[email protected]>
Diffstat (limited to 'src/gallium/drivers')
-rw-r--r-- | src/gallium/drivers/r300/r300_transfer.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/r600/r600_query.c | 2 | ||||
-rw-r--r-- | src/gallium/drivers/r600/r600_texture.c | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gallium/drivers/r300/r300_transfer.c b/src/gallium/drivers/r300/r300_transfer.c index 5e99cc467a8..d440db8e305 100644 --- a/src/gallium/drivers/r300/r300_transfer.c +++ b/src/gallium/drivers/r300/r300_transfer.c @@ -90,7 +90,7 @@ r300_texture_get_transfer(struct pipe_context *ctx, boolean referenced_cs, referenced_hw; referenced_cs = - r300->rws->cs_is_buffer_referenced(r300->cs, tex->cs_buf); + r300->rws->cs_is_buffer_referenced(r300->cs, tex->cs_buf, RADEON_USAGE_READWRITE); if (referenced_cs) { referenced_hw = TRUE; } else { diff --git a/src/gallium/drivers/r600/r600_query.c b/src/gallium/drivers/r600/r600_query.c index def0a9700f7..df5764aec68 100644 --- a/src/gallium/drivers/r600/r600_query.c +++ b/src/gallium/drivers/r600/r600_query.c @@ -346,7 +346,7 @@ static void r600_begin_query(struct pipe_context *ctx, struct pipe_query *query) } /* Obtain a new buffer if the current one can't be mapped without a stall. */ - if (rctx->ws->cs_is_buffer_referenced(rctx->cs, rquery->buffer.buf->cs_buf) || + if (rctx->ws->cs_is_buffer_referenced(rctx->cs, rquery->buffer.buf->cs_buf, RADEON_USAGE_READWRITE) || rctx->ws->buffer_is_busy(rquery->buffer.buf->buf, RADEON_USAGE_READWRITE)) { pipe_resource_reference((struct pipe_resource**)&rquery->buffer.buf, NULL); rquery->buffer.buf = r600_new_query_buffer(rctx, rquery->type); diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index 6e275ebc109..6222410f6c3 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -796,7 +796,7 @@ struct pipe_transfer* r600_texture_get_transfer(struct pipe_context *ctx, /* Use a staging texture for uploads if the underlying BO is busy. */ if (!(usage & PIPE_TRANSFER_READ) && - (rctx->ws->cs_is_buffer_referenced(rctx->cs, rtex->resource.cs_buf) || + (rctx->ws->cs_is_buffer_referenced(rctx->cs, rtex->resource.cs_buf, RADEON_USAGE_READWRITE) || rctx->ws->buffer_is_busy(rtex->resource.buf, RADEON_USAGE_READWRITE))) use_staging_texture = TRUE; |