diff options
| author | Marek Olšák <[email protected]> | 2018-04-01 15:07:58 -0400 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2018-04-05 15:34:58 -0400 |
| commit | 2b70dd8c8aad471c7a9ad06ddfe62ab765f7c650 (patch) | |
| tree | 9ef5d770a003bc56210cc45073f625370cb3b753 /src/gallium/drivers/radeonsi/si_dma.c | |
| parent | f7de8686de823f523ee53f354063d313f9dcecbe (diff) | |
radeonsi: flatten / remove struct r600_ring
Acked-by: Timothy Arceri <[email protected]>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_dma.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_dma.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/gallium/drivers/radeonsi/si_dma.c b/src/gallium/drivers/radeonsi/si_dma.c index 7a6d0b5be8a..46849e8e956 100644 --- a/src/gallium/drivers/radeonsi/si_dma.c +++ b/src/gallium/drivers/radeonsi/si_dma.c @@ -33,7 +33,7 @@ static void si_dma_copy_buffer(struct si_context *ctx, uint64_t src_offset, uint64_t size) { - struct radeon_winsys_cs *cs = ctx->b.dma.cs; + struct radeon_winsys_cs *cs = ctx->b.dma_cs; unsigned i, ncopy, count, max_size, sub_cmd, shift; struct r600_resource *rdst = (struct r600_resource*)dst; struct r600_resource *rsrc = (struct r600_resource*)src; @@ -82,7 +82,7 @@ static void si_dma_clear_buffer(struct pipe_context *ctx, unsigned clear_value) { struct si_context *sctx = (struct si_context *)ctx; - struct radeon_winsys_cs *cs = sctx->b.dma.cs; + struct radeon_winsys_cs *cs = sctx->b.dma_cs; unsigned i, ncopy, csize; struct r600_resource *rdst = r600_resource(dst); @@ -130,7 +130,7 @@ static void si_dma_copy_tile(struct si_context *ctx, unsigned pitch, unsigned bpp) { - struct radeon_winsys_cs *cs = ctx->b.dma.cs; + struct radeon_winsys_cs *cs = ctx->b.dma_cs; struct r600_texture *rsrc = (struct r600_texture*)src; struct r600_texture *rdst = (struct r600_texture*)dst; unsigned dst_mode = rdst->surface.u.legacy.level[dst_level].mode; @@ -231,7 +231,7 @@ static void si_dma_copy(struct pipe_context *ctx, unsigned src_x, src_y; unsigned dst_x = dstx, dst_y = dsty, dst_z = dstz; - if (sctx->b.dma.cs == NULL || + if (sctx->b.dma_cs == NULL || src->flags & PIPE_RESOURCE_FLAG_SPARSE || dst->flags & PIPE_RESOURCE_FLAG_SPARSE) { goto fallback; |