Mesa (master): radeonsi: fix blit compressed texture workaround to support 2D arrays

[Marek Olšák]

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

Author: Marek Olšák <marek.olsak at amd.com>
Date:   Mon Mar  3 19:22:56 2014 +0100

radeonsi: fix blit compressed texture workaround to support 2D arrays

We don't have a piglit test for this, but I think it's correct.

Reviewed-by: Michel Dänzer <michel.daenzer at amd.com>

---

 src/gallium/drivers/radeonsi/si_state.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c
index 225753d..8f90000 100644
--- a/src/gallium/drivers/radeonsi/si_state.c
+++ b/src/gallium/drivers/radeonsi/si_state.c
@@ -2588,7 +2588,8 @@ static struct pipe_sampler_view *si_create_sampler_view(struct pipe_context *ctx
 
 	va = r600_resource_va(ctx->screen, texture);
 	va += surflevel[0].offset;
-	va += tmp->mipmap_shift * surflevel[texture->last_level].slice_size;
+	va += tmp->mipmap_shift * surflevel[texture->last_level].slice_size * tmp->surface.array_size;
+
 	view->state[0] = va >> 8;
 	view->state[1] = (S_008F14_BASE_ADDRESS_HI(va >> 40) |
 			  S_008F14_DATA_FORMAT(format) |