diff options
author | Marek Olšák <[email protected]> | 2018-06-22 00:02:47 -0400 |
---|---|---|
committer | Marek Olšák <[email protected]> | 2018-06-25 18:33:58 -0400 |
commit | bd963f84302adb563136712c371023f15dadbea7 (patch) | |
tree | ed43912159ab6a838f169bb7d0c667b35eb6770f /src/gallium/drivers/radeonsi/si_buffer.c | |
parent | eabeeb86b272ff010a9fffcbf48ecf76d44c74cb (diff) |
radeonsi: rename r600_transfer -> si_transfer
Reviewed-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_buffer.c')
-rw-r--r-- | src/gallium/drivers/radeonsi/si_buffer.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/gallium/drivers/radeonsi/si_buffer.c b/src/gallium/drivers/radeonsi/si_buffer.c index 5c4ca5aefd2..a03a94453a4 100644 --- a/src/gallium/drivers/radeonsi/si_buffer.c +++ b/src/gallium/drivers/radeonsi/si_buffer.c @@ -341,7 +341,7 @@ static void *si_buffer_get_transfer(struct pipe_context *ctx, unsigned offset) { struct si_context *sctx = (struct si_context*)ctx; - struct r600_transfer *transfer; + struct si_transfer *transfer; if (usage & TC_TRANSFER_MAP_THREADED_UNSYNC) transfer = slab_alloc(&sctx->pool_transfers_unsync); @@ -517,17 +517,17 @@ static void si_buffer_do_flush_region(struct pipe_context *ctx, struct pipe_transfer *transfer, const struct pipe_box *box) { - struct r600_transfer *rtransfer = (struct r600_transfer*)transfer; + struct si_transfer *stransfer = (struct si_transfer*)transfer; struct r600_resource *rbuffer = r600_resource(transfer->resource); - if (rtransfer->staging) { + if (stransfer->staging) { struct pipe_resource *dst, *src; unsigned soffset; struct pipe_box dma_box; dst = transfer->resource; - src = &rtransfer->staging->b.b; - soffset = rtransfer->offset + box->x % SI_MAP_BUFFER_ALIGNMENT; + src = &stransfer->staging->b.b; + soffset = stransfer->offset + box->x % SI_MAP_BUFFER_ALIGNMENT; u_box_1d(soffset, box->width, &dma_box); @@ -558,14 +558,14 @@ static void si_buffer_transfer_unmap(struct pipe_context *ctx, struct pipe_transfer *transfer) { struct si_context *sctx = (struct si_context*)ctx; - struct r600_transfer *rtransfer = (struct r600_transfer*)transfer; + struct si_transfer *stransfer = (struct si_transfer*)transfer; if (transfer->usage & PIPE_TRANSFER_WRITE && !(transfer->usage & PIPE_TRANSFER_FLUSH_EXPLICIT)) si_buffer_do_flush_region(ctx, transfer, &transfer->box); - r600_resource_reference(&rtransfer->staging, NULL); - assert(rtransfer->b.staging == NULL); /* for threaded context only */ + r600_resource_reference(&stransfer->staging, NULL); + assert(stransfer->b.staging == NULL); /* for threaded context only */ pipe_resource_reference(&transfer->resource, NULL); /* Don't use pool_transfers_unsync. We are always in the driver |