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

diff --git a/src/gallium/drivers/radeonsi/evergreen_state.c b/src/gallium/drivers/radeonsi/evergreen_state.c
index c70b0b24d79e34260b5436b4e58ed0db956bfce3..3ab8d9d255cc3d1053d1d266f146e797a5ff3e8b 100644 (file)
--- 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])) |