diff options
| author | Marek Olšák <maraeo@gmail.com> | 2010-04-11 03:18:52 +0200 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-04-12 10:40:49 +1000 |
| commit | b73c5f8b2f85a7041e045e0009d046780416948d (patch) | |
| tree | b7290a5df4c819f26bd6f0b3302beb253c650fd0 /drivers/gpu/drm/radeon/r100.c | |
| parent | ce227c4183a2c18c9e5467b7e92d47140e763ab9 (diff) | |
| download | blackbird-op-linux-b73c5f8b2f85a7041e045e0009d046780416948d.tar.gz blackbird-op-linux-b73c5f8b2f85a7041e045e0009d046780416948d.zip | |
drm/radeon/kms: fix calculation of mipmapped 3D texture sizes
The 3rd dimension should be minified too.
Signed-off-by: Marek Olšák <maraeo@gmail.com>
Signed-off-by: Dave Airlie <airlied@redhat.com>
Diffstat (limited to 'drivers/gpu/drm/radeon/r100.c')
| -rw-r--r-- | drivers/gpu/drm/radeon/r100.c | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/drivers/gpu/drm/radeon/r100.c b/drivers/gpu/drm/radeon/r100.c index 3ae51ada1abf..e40dbdc4ebb3 100644 --- a/drivers/gpu/drm/radeon/r100.c +++ b/drivers/gpu/drm/radeon/r100.c @@ -2890,7 +2890,7 @@ static int r100_cs_track_texture_check(struct radeon_device *rdev, { struct radeon_bo *robj; unsigned long size; - unsigned u, i, w, h; + unsigned u, i, w, h, d; int ret; for (u = 0; u < track->num_texture; u++) { @@ -2922,20 +2922,25 @@ static int r100_cs_track_texture_check(struct radeon_device *rdev, h = h / (1 << i); if (track->textures[u].roundup_h) h = roundup_pow_of_two(h); + if (track->textures[u].tex_coord_type == 1) { + d = (1 << track->textures[u].txdepth) / (1 << i); + if (!d) + d = 1; + } else { + d = 1; + } if (track->textures[u].compress_format) { - size += r100_track_compress_size(track->textures[u].compress_format, w, h); + size += r100_track_compress_size(track->textures[u].compress_format, w, h) * d; /* compressed textures are block based */ } else - size += w * h; + size += w * h * d; } size *= track->textures[u].cpp; switch (track->textures[u].tex_coord_type) { case 0: - break; case 1: - size *= (1 << track->textures[u].txdepth); break; case 2: if (track->separate_cube) { |
