From 59a222039860128dc2520fa21d7cddc48c563e2f Mon Sep 17 00:00:00 2001 From: Eric Anholt Date: Tue, 25 Feb 2020 14:40:37 -0800 Subject: [PATCH] freedreno/a6xx: Remove the "aligned_height" temporary. Now that we're not incrementally minifying height, we can just modify it. Part-of: --- src/freedreno/fdl/fd6_layout.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/freedreno/fdl/fd6_layout.c b/src/freedreno/fdl/fd6_layout.c index fd2ec066577..5a371c173f0 100644 --- a/src/freedreno/fdl/fd6_layout.c +++ b/src/freedreno/fdl/fd6_layout.c @@ -132,13 +132,11 @@ fdl6_layout(struct fdl_layout *layout, width = u_minify(width0, level); height = u_minify(height0, level); } - uint32_t aligned_height = height; uint32_t pitchalign; if (tile_mode) { pitchalign = tile_alignment[ta].pitchalign; - aligned_height = align(aligned_height, - tile_alignment[ta].heightalign); + height = align(height, tile_alignment[ta].heightalign); } else { pitchalign = 64; } @@ -151,7 +149,7 @@ fdl6_layout(struct fdl_layout *layout, * may not be: */ if (level == mip_levels - 1) - aligned_height = align(aligned_height, 32); + height = align(height, 32); if (format_desc->layout == UTIL_FORMAT_LAYOUT_ASTC) slice->pitch = @@ -161,7 +159,7 @@ fdl6_layout(struct fdl_layout *layout, slice->offset = layout->size; uint32_t blocks = util_format_get_nblocks(format, - slice->pitch, aligned_height); + slice->pitch, height); /* 1d array and 2d array textures must all have the same layer size * for each miplevel on a6xx. 3d textures can have different layer -- 2.30.2