Mesa (master): r600: fix brownbag, only align if we are dealing with cubemap

Andre Maasikas andrem at kemper.freedesktop.org
Fri Jan 22 11:50:32 UTC 2010


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

Author: Andre Maasikas <amaasikas at gmail.com>
Date:   Fri Jan 22 13:47:31 2010 +0200

r600: fix brownbag, only align if we are dealing with cubemap

---

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

diff --git a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
index 5ea213d..a1a5239 100644
--- a/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
+++ b/src/mesa/drivers/dri/radeon/radeon_mipmap_tree.c
@@ -181,7 +181,7 @@ static void calculate_miptree_layout_r300(radeonContextPtr rmesa, radeon_mipmap_
 		 * we have separate register for 1'st level offset so add
 		 * 2 image alignment after 1'st mip level */
 		if(rmesa->radeonScreen->chip_family >= CHIP_FAMILY_R600 &&
-		   level >= 1)
+		   mt->target == GL_TEXTURE_CUBE_MAP && level >= 1)
 			curOffset += 2 * mt->levels[level].size;
 	}
 




More information about the mesa-commit mailing list