|
@@ -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) {
|