diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2013-09-23 02:37:05 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2013-09-29 15:18:09 +0200 |
| commit | ef6680d3eee621bbb207ca0eda2e142bcc099ed3 (patch) | |
| tree | 1a50f3c9490619f82efdba5c4480a47761edb0fa /src/gallium/drivers/r600/r600_texture.c | |
| parent | 1bb77f81db0ed3d1b3dd14c055ff7a9679399bb1 (diff) | |
| download | external_mesa3d-ef6680d3eee621bbb207ca0eda2e142bcc099ed3.zip external_mesa3d-ef6680d3eee621bbb207ca0eda2e142bcc099ed3.tar.gz external_mesa3d-ef6680d3eee621bbb207ca0eda2e142bcc099ed3.tar.bz2 | |
r600g: move the low-level buffer functions for multiple rings to drivers/radeon
Also slightly optimize r600_buffer_map_sync_with_rings.
Diffstat (limited to 'src/gallium/drivers/r600/r600_texture.c')
| -rw-r--r-- | src/gallium/drivers/r600/r600_texture.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c index 481c654..d505d6b 100644 --- a/src/gallium/drivers/r600/r600_texture.c +++ b/src/gallium/drivers/r600/r600_texture.c @@ -791,7 +791,7 @@ static void *r600_texture_transfer_map(struct pipe_context *ctx, /* Use a staging texture for uploads if the underlying BO is busy. */ if (!(usage & PIPE_TRANSFER_READ) && - (r600_rings_is_buffer_referenced(rctx, rtex->resource.cs_buf, RADEON_USAGE_READWRITE) || + (r600_rings_is_buffer_referenced(&rctx->b, rtex->resource.cs_buf, RADEON_USAGE_READWRITE) || rctx->b.ws->buffer_is_busy(rtex->resource.buf, RADEON_USAGE_READWRITE))) { use_staging_texture = TRUE; } @@ -898,7 +898,7 @@ static void *r600_texture_transfer_map(struct pipe_context *ctx, buf = &rtex->resource; } - if (!(map = r600_buffer_mmap_sync_with_rings(rctx, buf, usage))) { + if (!(map = r600_buffer_map_sync_with_rings(&rctx->b, buf, usage))) { pipe_resource_reference((struct pipe_resource**)&trans->staging, NULL); FREE(trans); return NULL; |