diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-04-21 23:46:19 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-05-10 17:20:09 +0200 |
| commit | 2f173b8e13308bea0690684f841fad28ccc2e40e (patch) | |
| tree | 65071cc447d274269286780efaed0ffdbad955ce /src/gallium/drivers/radeonsi/si_dma.c | |
| parent | 2af4b637d8a2da72a42ca8288dcab90fb1e2346c (diff) | |
| download | external_mesa3d-2f173b8e13308bea0690684f841fad28ccc2e40e.zip external_mesa3d-2f173b8e13308bea0690684f841fad28ccc2e40e.tar.gz external_mesa3d-2f173b8e13308bea0690684f841fad28ccc2e40e.tar.bz2 | |
gallium/radeon: use a common function for DMA blit preparation
this is more robust and probably fixes some bugs already
Reviewed-by: Alex Deucher <alexander.deucher@amd.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeonsi/si_dma.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/si_dma.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/src/gallium/drivers/radeonsi/si_dma.c b/src/gallium/drivers/radeonsi/si_dma.c index 72956ac..84961d5 100644 --- a/src/gallium/drivers/radeonsi/si_dma.c +++ b/src/gallium/drivers/radeonsi/si_dma.c @@ -230,17 +230,10 @@ void si_dma_copy(struct pipe_context *ctx, */ goto fallback; - if (src->format != dst->format || src_box->depth > 1 || - (rdst->dirty_level_mask | rdst->stencil_dirty_level_mask) & (1 << dst_level) || - rdst->cmask.size || rdst->fmask.size || - rsrc->cmask.size || rsrc->fmask.size || - rdst->dcc_offset || rsrc->dcc_offset) { + if (src_box->depth > 1 || + !r600_prepare_for_dma_blit(&sctx->b, rdst, dst_level, dstx, dsty, + dstz, rsrc, src_level, src_box)) goto fallback; - } - - if (rsrc->dirty_level_mask & (1 << src_level)) { - ctx->flush_resource(ctx, src); - } src_x = util_format_get_nblocksx(src->format, src_box->x); dst_x = util_format_get_nblocksx(src->format, dst_x); |