Mesa (master): radeonsi: Fix 1D tiling mode index for non-scanout resources .

[Michel Dänzer]

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

Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu Jan 17 19:15:15 2013 +0100

radeonsi: Fix 1D tiling mode index for non-scanout resources.

Reviewed-by: Christian König <christian.koenig at amd.com>
Signed-off-by: Michel Dänzer <michel.daenzer at amd.com>

---

 src/gallium/drivers/radeonsi/si_state.c |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index f7fe603..ee353ed 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -1524,7 +1524,10 @@ static unsigned si_tile_mode_index(struct r600_resource_texture *rtex, unsigned
 	case RADEON_SURF_MODE_LINEAR_ALIGNED:
 		return 8;
 	case RADEON_SURF_MODE_1D:
-		return 9;
+		if (rtex->surface.flags & RADEON_SURF_SCANOUT)
+			return 9;
+		else
+			return 13;
 	case RADEON_SURF_MODE_2D:
 		if (rtex->surface.flags & RADEON_SURF_SCANOUT) {
 			switch (util_format_get_blocksize(rtex->real_format)) {