Mesa (master): r600: cube mipmap levels are aligned to 8 faces only starting from r7xx

[Andre Maasikas]

Module: Mesa
Branch: master
Commit: c3c25a7ab8507c9c6b21137de03b5d94c2420369
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=c3c25a7ab8507c9c6b21137de03b5d94c2420369

Author: Andre Maasikas <amaasikas at gmail.com>
Date:   Wed Sep  1 09:19:51 2010 +0300

r600: cube mipmap levels are aligned to 8 faces only starting from r7xx

---

 src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
index c6e5f11..ddfde3e 100644
--- a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
+++ b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
@@ -199,10 +199,10 @@ static void calculate_miptree_layout_r300(radeonContextPtr rmesa, radeon_mipmap_
 
 		for(face = 0; face < mt->faces; face++)
 			compute_tex_image_offset(rmesa, mt, face, level, &curOffset);
-		/* r600 cube levels seems to be aligned to 8 faces but
-		 * we have separate register for 1'st level offset so add
+		/* from r700? cube levels seems to be aligned to 8 faces,
+		 * as we have separate register for 1'st level offset add
 		 * 2 image alignment after 1'st mip level */
-		if(rmesa->radeonScreen->chip_family >= CHIP_FAMILY_R600 &&
+		if(rmesa->radeonScreen->chip_family >= CHIP_FAMILY_RV770 &&
 		   mt->target == GL_TEXTURE_CUBE_MAP && level >= 1)
 			curOffset += 2 * mt->levels[level].size;
 	}