From: Marek Olšák Date: Mon, 3 Mar 2014 18:22:56 +0000 (+0100) Subject: radeonsi: fix blit compressed texture workaround to support 2D arrays X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=472ac0db08011af21174bb35e45858480b866346;p=mesa.git 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 --- diff --git a/src/gallium/drivers/radeonsi/si_state.c b/src/gallium/drivers/radeonsi/si_state.c index 225753db9e6..8f90000eea0 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) |