From: Andre Maasikas <amaasikas@gmail.com>
Date: Mon, 9 Aug 2010 11:37:01 +0000 (+0300)
Subject: radeon: fix npot mipmap alignment on r600
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=67ee40684d253f194dbbd5c81799da61151ee09f;p=mesa.git

radeon: fix npot mipmap alignment on r600

seems it got lost in commit 0d383547
have no earlier radeons to test, but npot mipmaps were not supported there?
---

diff --git a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
index c877e6c1765..c6e5f110ea3 100644
--- a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
+++ b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
@@ -133,7 +133,7 @@ static void compute_tex_image_offset(radeonContextPtr rmesa, radeon_mipmap_tree
 	height = _mesa_next_pow_two_32(lvl->height);
 
 	lvl->rowstride = get_texture_image_row_stride(rmesa, mt->mesaFormat, lvl->width, mt->tilebits);
-	lvl->size = get_texture_image_size(mt->mesaFormat, lvl->rowstride, lvl->height, lvl->depth, mt->tilebits);
+	lvl->size = get_texture_image_size(mt->mesaFormat, lvl->rowstride, height, lvl->depth, mt->tilebits);
 
 	assert(lvl->size > 0);