diff options
| author | Marek Olšák <marek.olsak@amd.com> | 2016-04-22 23:39:23 +0200 |
|---|---|---|
| committer | Marek Olšák <marek.olsak@amd.com> | 2016-04-28 20:16:56 +0200 |
| commit | 92f6af2c4a360c6e499ead0fdfbd57e63615e9bb (patch) | |
| tree | bc0cc9b6b0017617773ba314db96288c30abd943 /src/gallium/drivers/radeonsi/cik_sdma.c | |
| parent | f564b61d33fd8fd23211e1762e2b04c25495b8fd (diff) | |
| download | external_mesa3d-92f6af2c4a360c6e499ead0fdfbd57e63615e9bb.zip external_mesa3d-92f6af2c4a360c6e499ead0fdfbd57e63615e9bb.tar.gz external_mesa3d-92f6af2c4a360c6e499ead0fdfbd57e63615e9bb.tar.bz2 | |
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 <alexander.deucher@amd.com>
Diffstat (limited to 'src/gallium/drivers/radeonsi/cik_sdma.c')
| -rw-r--r-- | src/gallium/drivers/radeonsi/cik_sdma.c | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/gallium/drivers/radeonsi/cik_sdma.c b/src/gallium/drivers/radeonsi/cik_sdma.c index 6eb62dc..07a7d94 100644 --- a/src/gallium/drivers/radeonsi/cik_sdma.c +++ b/src/gallium/drivers/radeonsi/cik_sdma.c @@ -126,17 +126,14 @@ static void cik_sdma_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); - assert(src_mode == RADEON_SURF_MODE_LINEAR || dst_mode == RADEON_SURF_MODE_LINEAR); + assert(src_mode == RADEON_SURF_MODE_LINEAR_ALIGNED || dst_mode == RADEON_SURF_MODE_LINEAR_ALIGNED); sub_op = CIK_SDMA_COPY_SUB_OPCODE_TILED; lbpe = util_logbase2(bpe); pitch_tile_max = ((pitch / bpe) / 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; @@ -276,12 +273,9 @@ void cik_sdma_copy(struct pipe_context *ctx, copy_height = src_box->height / rsrc->surface.blk_h; 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; /* Dimensions must be aligned to (macro)tiles */ - switch (src_mode == RADEON_SURF_MODE_LINEAR ? dst_mode : src_mode) { + switch (src_mode == RADEON_SURF_MODE_LINEAR_ALIGNED ? dst_mode : src_mode) { case RADEON_SURF_MODE_1D: if ((src_x % 8) || (src_y % 8) || (dst_x % 8) || (dst_y % 8) || (copy_height % 8)) |