From: Christian König <deathsimple@vodafone.de>
Date: Mon, 29 Aug 2011 10:14:30 +0000 (+0200)
Subject: r600g: Make unaligned 3D textures work on +evergreen
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=8f4ec55f77a993ec44db56726187bdd4f041880e;p=mesa.git

r600g: Make unaligned 3D textures work on +evergreen

The layersize calculation is slightly different on +evergreen.
This makes mpeg2 video decoding and piglits texture-packed-formats
test work correctly on this hardware.
---

diff --git a/src/gallium/drivers/r600/r600_texture.c b/src/gallium/drivers/r600/r600_texture.c
index 3bd53501b49..691cc48dea7 100644
--- a/src/gallium/drivers/r600/r600_texture.c
+++ b/src/gallium/drivers/r600/r600_texture.c
@@ -262,7 +262,11 @@ static void r600_setup_miptree(struct pipe_screen *screen,
 		nblocksx = r600_texture_get_nblocksx(screen, rtex, i);
 		nblocksy = r600_texture_get_nblocksy(screen, rtex, i);
 
-		layer_size = nblocksx * nblocksy * blocksize;
+		if (chipc >= EVERGREEN && array_mode == V_038000_ARRAY_LINEAR_GENERAL)
+			layer_size = align(nblocksx, 64) * nblocksy * blocksize;
+		else
+			layer_size = nblocksx * nblocksy * blocksize;
+
 		if (ptex->target == PIPE_TEXTURE_CUBE) {
 			if (chipc >= R700)
 				size = layer_size * 8;