[Mesa-dev] [PATCH 5/6] etnaviv: simplify transfer tiling handling

[Wladimir J. van der Laan]

On Fri, May 19, 2017 at 11:41:11AM +0200, Lucas Stach wrote:
> There is no need to special case compressed resources, as they are already
> marked as linear on allocation. With that out of the way, there is room to
> cut down on the number of if clauses used.

Code change looks good to me. Resource layout is explicit, and not dependent
on the compressed-ness of the texture format.

Reviewed-By: Wladimir J. van der Laan <laanwj at gmail.com>

> Signed-off-by: Lucas Stach <l.stach at pengutronix.de>
> ---
>  src/gallium/drivers/etnaviv/etnaviv_transfer.c | 70 +++++++++++---------------
>  1 file changed, 29 insertions(+), 41 deletions(-)
> 
> diff --git a/src/gallium/drivers/etnaviv/etnaviv_transfer.c b/src/gallium/drivers/etnaviv/etnaviv_transfer.c
> index f7871f485371..05cdbc599956 100644
> --- a/src/gallium/drivers/etnaviv/etnaviv_transfer.c
> +++ b/src/gallium/drivers/etnaviv/etnaviv_transfer.c
> @@ -85,21 +85,19 @@ etna_transfer_unmap(struct pipe_context *pctx, struct pipe_transfer *ptrans)
>           struct etna_resource_level *res_level = &rsc->levels[ptrans->level];
>           void *mapped = etna_bo_map(rsc->bo) + res_level->offset;
>  
> -         if (rsc->layout == ETNA_LAYOUT_LINEAR || rsc->layout == ETNA_LAYOUT_TILED) {
> -            if (rsc->layout == ETNA_LAYOUT_TILED && !util_format_is_compressed(rsc->base.format)) {
> -               etna_texture_tile(
> -                  mapped + ptrans->box.z * res_level->layer_stride,
> -                  trans->staging, ptrans->box.x, ptrans->box.y,
> -                  res_level->stride, ptrans->box.width, ptrans->box.height,
> -                  ptrans->stride, util_format_get_blocksize(rsc->base.format));
> -            } else { /* non-tiled or compressed format */
> -               util_copy_box(mapped, rsc->base.format, res_level->stride,
> -                             res_level->layer_stride, ptrans->box.x,
> -                             ptrans->box.y, ptrans->box.z, ptrans->box.width,
> -                             ptrans->box.height, ptrans->box.depth,
> -                             trans->staging, ptrans->stride,
> -                             ptrans->layer_stride, 0, 0, 0 /* src x,y,z */);
> -            }

> +         if (rsc->layout == ETNA_LAYOUT_TILED) {
> +            etna_texture_tile(
> +               mapped + ptrans->box.z * res_level->layer_stride,
> +               trans->staging, ptrans->box.x, ptrans->box.y,
> +               res_level->stride, ptrans->box.width, ptrans->box.height,
> +               ptrans->stride, util_format_get_blocksize(rsc->base.format));
> +         } else if (rsc->layout == ETNA_LAYOUT_LINEAR) {
> +            util_copy_box(mapped, rsc->base.format, res_level->stride,
> +                          res_level->layer_stride, ptrans->box.x,
> +                          ptrans->box.y, ptrans->box.z, ptrans->box.width,
> +                          ptrans->box.height, ptrans->box.depth,
> +                          trans->staging, ptrans->stride,
> +                          ptrans->layer_stride, 0, 0, 0 /* src x,y,z */);
>           } else {
>              BUG("unsupported tiling %i", rsc->layout);
>           }
> @@ -255,13 +253,6 @@ etna_transfer_map(struct pipe_context *pctx, struct pipe_resource *prsc,
>        PIPE_TRANSFER_DISCARD_WHOLE_RESOURCE is set.
>      */
>  
> -   /* No need to allocate a buffer for copying if the resource is not in use,
> -    * and no tiling is needed, can just return a direct pointer.
> -    */
> -   bool in_place = rsc->layout == ETNA_LAYOUT_LINEAR ||
> -                   (rsc->layout == ETNA_LAYOUT_TILED &&
> -                    util_format_is_compressed(prsc->format));
> -
>     if (trans->rsc || !(usage & PIPE_TRANSFER_UNSYNCHRONIZED)) {
>        uint32_t prep_flags = 0;
>  
> @@ -281,7 +272,7 @@ etna_transfer_map(struct pipe_context *pctx, struct pipe_resource *prsc,
>  
>     *out_transfer = ptrans;
>  
> -   if (in_place) {
> +   if (rsc->layout == ETNA_LAYOUT_LINEAR) {
>        ptrans->stride = res_level->stride;
>        ptrans->layer_stride = res_level->layer_stride;
>  
> @@ -308,24 +299,21 @@ etna_transfer_map(struct pipe_context *pctx, struct pipe_resource *prsc,
>           goto fail;
>  
>        if (usage & PIPE_TRANSFER_READ) {
> -         /* untile or copy resource for reading */
> -         if (rsc->layout == ETNA_LAYOUT_LINEAR || rsc->layout == ETNA_LAYOUT_TILED) {
> -            if (rsc->layout == ETNA_LAYOUT_TILED && !util_format_is_compressed(rsc->base.format)) {
> -               etna_texture_untile(trans->staging,
> -                                   mapped + ptrans->box.z * res_level->layer_stride,
> -                                   ptrans->box.x, ptrans->box.y, res_level->stride,
> -                                   ptrans->box.width, ptrans->box.height, ptrans->stride,
> -                                   util_format_get_blocksize(rsc->base.format));
> -            } else { /* non-tiled or compressed format */
> -               util_copy_box(trans->staging, rsc->base.format, ptrans->stride,
> -                             ptrans->layer_stride, 0, 0, 0, /* dst x,y,z */
> -                             ptrans->box.width, ptrans->box.height,
> -                             ptrans->box.depth, mapped, res_level->stride,
> -                             res_level->layer_stride, ptrans->box.x,
> -                             ptrans->box.y, ptrans->box.z);
> -            }
> -         } else /* TODO supertiling */
> -         {
> +         if (rsc->layout == ETNA_LAYOUT_TILED) {
> +            etna_texture_untile(trans->staging,
> +                                mapped + ptrans->box.z * res_level->layer_stride,
> +                                ptrans->box.x, ptrans->box.y, res_level->stride,
> +                                ptrans->box.width, ptrans->box.height, ptrans->stride,
> +                                util_format_get_blocksize(rsc->base.format));
> +         } else if (rsc->layout == ETNA_LAYOUT_LINEAR) {
> +            util_copy_box(trans->staging, rsc->base.format, ptrans->stride,
> +                          ptrans->layer_stride, 0, 0, 0, /* dst x,y,z */
> +                          ptrans->box.width, ptrans->box.height,
> +                          ptrans->box.depth, mapped, res_level->stride,
> +                          res_level->layer_stride, ptrans->box.x,
> +                          ptrans->box.y, ptrans->box.z);
> +         } else {
> +            /* TODO supertiling */
>              BUG("unsupported tiling %i for reading", rsc->layout);
>           }
>        }
> -- 
> 2.11.0
> 
> _______________________________________________
> etnaviv mailing list
> etnaviv at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/etnaviv