freedreno: rework blit API

[mesa.git] / src / gallium / drivers / freedreno / a5xx / fd5_blitter.c

diff --git a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
index 6d4fa2c684cfcaebb9610720a32dca92f6759139..0cfe92ac22f5e9e979f769a11eb8e78c10377603 100644 (file)
--- a/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
+++ b/src/gallium/drivers/freedreno/a5xx/fd5_blitter.c
@@ -93,6 +93,16 @@ can_do_blit(const struct pipe_blit_info *info)
        if (!ok_format(info->src.format))
                return false;
 
+       /* hw ignores {SRC,DST}_INFO.COLOR_SWAP if {SRC,DST}_INFO.TILE_MODE
+        * is set (not linear).  We can kind of get around that when tiling/
+        * untiling by setting both src and dst COLOR_SWAP=WZYX, but that
+        * means the formats must match:
+        */
+       if ((fd_resource(info->dst.resource)->tile_mode ||
+                               fd_resource(info->src.resource)->tile_mode) &&
+                       info->dst.format != info->src.format)
+               return false;
+
        /* until we figure out a few more registers: */
        if ((info->dst.box.width != info->src.box.width) ||
                        (info->dst.box.height != info->src.box.height))
@@ -342,6 +352,16 @@ emit_blit(struct fd_ringbuffer *ring, const struct pipe_blit_info *info)
        spitch = sslice->pitch * src->cpp;
        dpitch = dslice->pitch * dst->cpp;
 
+       /* if dtile, then dswap ignored by hw, and likewise if stile then sswap
+        * ignored by hw.. but in this case we have already rejected the blit
+        * if src and dst formats differ, so juse use WZYX for both src and
+        * dst swap mode (so we don't change component order)
+        */
+       if (stile || dtile) {
+               debug_assert(info->src.format == info->dst.format);
+               sswap = dswap = WZYX;
+       }
+
        sx1 = sbox->x;
        sy1 = sbox->y;
        sx2 = sbox->x + sbox->width - 1;
@@ -429,17 +449,16 @@ emit_blit(struct fd_ringbuffer *ring, const struct pipe_blit_info *info)
        }
 }
 
-void
+bool
 fd5_blitter_blit(struct fd_context *ctx, const struct pipe_blit_info *info)
 {
        struct fd_batch *batch;
 
        if (!can_do_blit(info)) {
-               fd_blitter_blit(ctx, info);
-               return;
+               return false;
        }
 
-       batch = fd_batch_create(ctx, true);
+       batch = fd_bc_alloc_batch(&ctx->screen->batch_cache, ctx, true);
 
        fd5_emit_restore(batch, batch->draw);
        fd5_emit_lrz_flush(batch->draw);
@@ -462,6 +481,8 @@ fd5_blitter_blit(struct fd_context *ctx, const struct pipe_blit_info *info)
        batch->needs_flush = true;
 
        fd_batch_flush(batch, false, false);
+
+       return true;
 }
 
 unsigned