Mesa (master): radeonsi: Eliminate one more magic number for texture image resources.

[Michel Dänzer]

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

Author: Michel Dänzer <michel.daenzer at amd.com>
Date:   Thu May 10 13:54:27 2012 +0200

radeonsi: Eliminate one more magic number for texture image resources.

---

 src/gallium/drivers/radeonsi/evergreen_state.c |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gallium/drivers/radeonsi/evergreen_state.c b/src/gallium/drivers/radeonsi/evergreen_state.c
index c70b0b2..3ab8d9d 100644
--- a/src/gallium/drivers/radeonsi/evergreen_state.c
+++ b/src/gallium/drivers/radeonsi/evergreen_state.c
@@ -1259,9 +1259,9 @@ static struct pipe_sampler_view *evergreen_create_sampler_view(struct pipe_conte
 
 	va = r600_resource_va(ctx->screen, texture);
 	view->state[0] = (va + tmp->offset[0]) >> 8;
-	view->state[1] = ((va + tmp->offset[0]) >> 40) & 0xff;
-	view->state[1] |= (S_008F14_DATA_FORMAT(format) |
-			   S_008F14_NUM_FORMAT(num_format));
+	view->state[1] = (S_008F14_BASE_ADDRESS_HI((va + tmp->offset[0]) >> 40) |
+			  S_008F14_DATA_FORMAT(format) |
+			  S_008F14_NUM_FORMAT(num_format));
 	view->state[2] = (S_008F18_WIDTH(texture->width0 - 1) |
 			  S_008F18_HEIGHT(height - 1));
 	view->state[3] = (S_008F1C_DST_SEL_X(si_map_swizzle(swizzle[0])) |