OpenHarmony/third_party_mesa3d
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

i965: Remove unnecessary mt->compressed checks

Browse Source 
It's harmless to use ALIGN_NPOT() for uncompressed formats
because they have block width/height = 1.

Signed-off-by: Anuj Phogat <anuj.phogat@gmail.com>
Reviewed-by: Alejandro Piñeiro <apinheiro@igalia.com>
This commit is contained in:
Anuj Phogat
2017-01-10 14:04:19 -08:00
parent c7e37a0cb8
commit 6de293284b
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/mesa/drivers/dri/i965/brw_tex_layout.c
View File

@@ -302,9 +302,7 @@ brw_miptree_layout_2d(struct intel_mipmap_tree *mt)
_mesa_get_format_block_size(mt->format, &bw, &bh); _mesa_get_format_block_size(mt->format, &bw, &bh);
mt->total_width = mt->physical_width0; mt->total_width = mt->physical_width0;
mt->total_width = ALIGN_NPOT(mt->total_width, bw);
if (mt->compressed)
mt->total_width = ALIGN_NPOT(mt->total_width, bw);
/* May need to adjust width to accommodate the placement of /* May need to adjust width to accommodate the placement of
* the 2nd mipmap. This occurs when the alignment * the 2nd mipmap. This occurs when the alignment
@@ -314,13 +312,8 @@ brw_miptree_layout_2d(struct intel_mipmap_tree *mt)
if (mt->first_level != mt->last_level) { if (mt->first_level != mt->last_level) {
unsigned mip1_width; unsigned mip1_width;
if (mt->compressed) { mip1_width = ALIGN_NPOT(minify(mt->physical_width0, 1), mt->halign) +
mip1_width = ALIGN_NPOT(minify(mt->physical_width0, 1), mt->halign) + ALIGN_NPOT(minify(mt->physical_width0, 2), bw);
ALIGN_NPOT(minify(mt->physical_width0, 2), bw);
} else {
mip1_width = ALIGN_NPOT(minify(mt->physical_width0, 1), mt->halign) +
minify(mt->physical_width0, 2);
}
if (mip1_width > mt->total_width) if (mip1_width > mt->total_width)
mt->total_width = mip1_width; mt->total_width = mip1_width;
@@ -335,8 +328,7 @@ brw_miptree_layout_2d(struct intel_mipmap_tree *mt)
intel_miptree_set_level_info(mt, level, x, y, depth); intel_miptree_set_level_info(mt, level, x, y, depth);
img_height = ALIGN_NPOT(height, mt->valign); img_height = ALIGN_NPOT(height, mt->valign);
if (mt->compressed) img_height /= bh;
img_height /= bh;
if (mt->array_layout == ALL_SLICES_AT_EACH_LOD) { if (mt->array_layout == ALL_SLICES_AT_EACH_LOD) {
/* Compact arrays with separated miplevels */ /* Compact arrays with separated miplevels */