AlexIndustrial/mesa
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

r300g: do not align compressed textures to a tile size

Browse Source
This commit is contained in:
Marek Olšák
2010-01-16 01:45:10 +01:00
committed by Corbin Simpson
parent 064eb0a095
commit cd553ec8be
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/gallium/drivers/r300/r300_texture.c
+14 -6
View File
@@ -139,11 +139,15 @@ unsigned r300_texture_get_stride(struct r300_screen* screen,
return 0;
}
tile_width = r300_texture_get_tile_size(tex, TILE_WIDTH);
width = align(u_minify(tex->tex.width0, level), tile_width);
width = u_minify(tex->tex.width0, level);
/* Should already be aligned except for S3TC. */
return align(util_format_get_stride(tex->tex.format, width), 32);
if (!util_format_is_compressed(tex->tex.format)) {
tile_width = r300_texture_get_tile_size(tex, TILE_WIDTH);
width = align(width, tile_width);
return util_format_get_stride(tex->tex.format, width);
} else {
return align(util_format_get_stride(tex->tex.format, width), 32);
}
}
static unsigned r300_texture_get_nblocksy(struct r300_texture* tex,
@@ -151,8 +155,12 @@ static unsigned r300_texture_get_nblocksy(struct r300_texture* tex,
{
unsigned height, tile_height;
tile_height = r300_texture_get_tile_size(tex, TILE_HEIGHT);
height = align(u_minify(tex->tex.height0, level), tile_height);
height = u_minify(tex->tex.height0, level);
if (!util_format_is_compressed(tex->tex.format)) {
tile_height = r300_texture_get_tile_size(tex, TILE_HEIGHT);
height = align(height, tile_height);
}
return util_format_get_nblocksy(tex->tex.format, height);
}