r300g: do not align texture height to 2^n for 1D and 2D non-mipmapped textures

I don't remember why the alignment was there, but it seems to be
no longer needed. I guess it was a dirty fix for some other bug.
This commit is contained in:
Marek Olšák
2010-07-24 03:07:45 +02:00
parent 5603d2e4c4
commit 3adb5c7d45

View File

@@ -774,7 +774,11 @@ static unsigned r300_texture_get_nblocksy(struct r300_texture* tex,
height = align(height, tile_height);
/* This is needed for the kernel checker, unfortunately. */
height = util_next_power_of_two(height);
if ((tex->b.b.target != PIPE_TEXTURE_1D &&
tex->b.b.target != PIPE_TEXTURE_2D) ||
tex->b.b.last_level != 0) {
height = util_next_power_of_two(height);
}
}
return util_format_get_nblocksy(tex->b.b.format, height);