freedreno: helper to calc layer/level offset

Rather than duplicating this everywhere.  Especially as on a4xx the
layout of layers and levels differs based on texture type.

Signed-off-by: Rob Clark <[email protected]>

2 files changed, 11 insertions, 10 deletions

diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
index 839d3e8e441..d278bb5e009 100644
--- a/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_emit.c
@@ -231,8 +231,8 @@ fd4_emit_gmem_restore_tex(struct fd_ringbuffer *ring, struct pipe_surface *psurf
 {
 	struct fd_resource *rsc = fd_resource(psurf->texture);
 	unsigned lvl = psurf->u.tex.level;
-	struct fd_resource_slice *slice = &rsc->slices[lvl];
-	uint32_t layer_offset = slice->size0 * psurf->u.tex.first_layer;
+	struct fd_resource_slice *slice = fd_resource_slice(rsc, lvl);
+	uint32_t offset = fd_resource_offset(rsc, lvl, psurf->u.tex.first_layer);
 	enum pipe_format format = fd4_gmem_restore_format(psurf->format);
 
 	debug_assert(psurf->u.tex.first_layer == psurf->u.tex.last_layer);
@@ -268,7 +268,7 @@ fd4_emit_gmem_restore_tex(struct fd_ringbuffer *ring, struct pipe_surface *psurf
 			A4XX_TEX_CONST_1_HEIGHT(psurf->height));
 	OUT_RING(ring, A4XX_TEX_CONST_2_PITCH(slice->pitch * rsc->cpp));
 	OUT_RING(ring, 0x00000000);
-	OUT_RELOC(ring, rsc->bo, layer_offset, 0, 0);
+	OUT_RELOC(ring, rsc->bo, offset, 0, 0);
 	OUT_RING(ring, 0x00000000);
 	OUT_RING(ring, 0x00000000);
 	OUT_RING(ring, 0x00000000);
diff --git a/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c b/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c
index 3c900522443..e45e209e59e 100644
--- a/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c
+++ b/src/gallium/drivers/freedreno/a4xx/fd4_gmem.c
@@ -63,19 +63,20 @@ emit_mrt(struct fd_ringbuffer *ring, unsigned nr_bufs,
 		struct fd_resource_slice *slice = NULL;
 		uint32_t stride = 0;
 		uint32_t base = 0;
-		uint32_t layer_offset = 0;
+		uint32_t offset = 0;
 
 		if ((i < nr_bufs) && bufs[i]) {
 			struct pipe_surface *psurf = bufs[i];
 
 			rsc = fd_resource(psurf->texture);
-			slice = &rsc->slices[psurf->u.tex.level];
+			slice = fd_resource_slice(rsc, psurf->u.tex.level);
 			format = fd4_pipe2color(psurf->format);
 			swap = fd4_pipe2swap(psurf->format);
 
 			debug_assert(psurf->u.tex.first_layer == psurf->u.tex.last_layer);
 
-			layer_offset = slice->size0 * psurf->u.tex.first_layer;
+			offset = fd_resource_offset(rsc, psurf->u.tex.level,
+					psurf->u.tex.first_layer);
 
 			if (bin_w) {
 				stride = bin_w * rsc->cpp;
@@ -96,8 +97,7 @@ emit_mrt(struct fd_ringbuffer *ring, unsigned nr_bufs,
 		if (bin_w || (i >= nr_bufs)) {
 			OUT_RING(ring, base);
 		} else {
-			OUT_RELOCW(ring, rsc->bo,
-					slice->offset + layer_offset, 0, -1);
+			OUT_RELOCW(ring, rsc->bo, offset, 0, -1);
 		}
 		OUT_RING(ring, A4XX_RB_MRT_CONTROL3_STRIDE(stride));
 	}
@@ -126,7 +126,8 @@ emit_gmem2mem_surf(struct fd_context *ctx,
 	struct fd_ringbuffer *ring = ctx->ring;
 	struct fd_resource *rsc = fd_resource(psurf->texture);
 	struct fd_resource_slice *slice = &rsc->slices[psurf->u.tex.level];
-	uint32_t layer_offset = slice->size0 * psurf->u.tex.first_layer;
+	uint32_t offset = fd_resource_offset(rsc, psurf->u.tex.level,
+			psurf->u.tex.first_layer);
 
 	debug_assert(psurf->u.tex.first_layer == psurf->u.tex.last_layer);
 
@@ -134,7 +135,7 @@ emit_gmem2mem_surf(struct fd_context *ctx,
 	OUT_RING(ring, A4XX_RB_COPY_CONTROL_MSAA_RESOLVE(MSAA_ONE) |
 			A4XX_RB_COPY_CONTROL_MODE(RB_COPY_RESOLVE) |
 			A4XX_RB_COPY_CONTROL_GMEM_BASE(base));
-	OUT_RELOCW(ring, rsc->bo, slice->offset + layer_offset, 0, 0);   /* RB_COPY_DEST_BASE */
+	OUT_RELOCW(ring, rsc->bo, offset, 0, 0);   /* RB_COPY_DEST_BASE */
 	OUT_RING(ring, A4XX_RB_COPY_DEST_PITCH_PITCH(slice->pitch * rsc->cpp));
 	OUT_RING(ring, A4XX_RB_COPY_DEST_INFO_TILE(TILE4_LINEAR) |
 			A4XX_RB_COPY_DEST_INFO_FORMAT(fd4_pipe2color(psurf->format)) |