diff options
| author | Marek Olšák <[email protected]> | 2016-04-22 23:39:23 +0200 |
|---|---|---|
| committer | Marek Olšák <[email protected]> | 2016-04-28 20:16:56 +0200 |
| commit | 92f6af2c4a360c6e499ead0fdfbd57e63615e9bb (patch) | |
| tree | bc0cc9b6b0017617773ba314db96288c30abd943 /src/gallium/drivers/radeonsi/si_dma.c | |
| parent | f564b61d33fd8fd23211e1762e2b04c25495b8fd (diff) | |
gallium/radeon: drop support for LINEAR_GENERAL layout
Unused. All texture imports use LINEAR_ALIGNED regardless of what
the DDX does.
Reviewed-by: Alex Deucher <[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, 1 insertions, 7 deletions
diff --git a/src/gallium/drivers/radeonsi/si_dma.c b/src/gallium/drivers/radeonsi/si_dma.c index 0efca193951..688edbe601f 100644 --- a/src/gallium/drivers/radeonsi/si_dma.c +++ b/src/gallium/drivers/radeonsi/si_dma.c @@ -126,16 +126,13 @@ static void si_dma_copy_tile(struct si_context *ctx, dst_mode = rdst->surface.level[dst_level].mode; src_mode = rsrc->surface.level[src_level].mode; - /* downcast linear aligned to linear to simplify test */ - src_mode = src_mode == RADEON_SURF_MODE_LINEAR_ALIGNED ? RADEON_SURF_MODE_LINEAR : src_mode; - dst_mode = dst_mode == RADEON_SURF_MODE_LINEAR_ALIGNED ? RADEON_SURF_MODE_LINEAR : dst_mode; assert(dst_mode != src_mode); sub_cmd = SI_DMA_COPY_TILED; lbpp = util_logbase2(bpp); pitch_tile_max = ((pitch / bpp) / 8) - 1; - detile = dst_mode == RADEON_SURF_MODE_LINEAR; + detile = dst_mode == RADEON_SURF_MODE_LINEAR_ALIGNED; rlinear = detile ? rdst : rsrc; rtiled = detile ? rsrc : rdst; linear_lvl = detile ? dst_level : src_level; @@ -270,9 +267,6 @@ void si_dma_copy(struct pipe_context *ctx, dst_mode = rdst->surface.level[dst_level].mode; src_mode = rsrc->surface.level[src_level].mode; - /* downcast linear aligned to linear to simplify test */ - src_mode = src_mode == RADEON_SURF_MODE_LINEAR_ALIGNED ? RADEON_SURF_MODE_LINEAR : src_mode; - dst_mode = dst_mode == RADEON_SURF_MODE_LINEAR_ALIGNED ? RADEON_SURF_MODE_LINEAR : dst_mode; if (src_pitch != dst_pitch || src_box->x || dst_x || src_w != dst_w || src_box->width != src_w || |