Am Dienstag, den 19.09.2017, 16:24 +0200 schrieb Wladimir J. van der
Laan:
> On Fri, Sep 15, 2017 at 06:00:52PM +0200, Lucas Stach wrote:
> > The RS can blit abitrary tile aligned subregions of a resource by
> > adjusting the buffer offset.
>
> Thanks for doing this.
>
> Comments inline,
>
> > Signed-off-by: Lucas Stach <l.st...@pengutronix.de>
> > ---
> > src/gallium/drivers/etnaviv/etnaviv_clear_blit.c | 75
> > +++++++++++++++++++++---
> > 1 file changed, 67 insertions(+), 8 deletions(-)
> >
> > diff --git a/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c
> > b/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c
> > index 92c91073434a..6734968ee4ed 100644
> > --- a/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c
> > +++ b/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c
> > @@ -358,6 +358,38 @@ etna_manual_blit(struct etna_resource *dst, struct
> > etna_resource_level *dst_lev,
> > return true;
> > }
> >
> > +static inline size_t
> > +etna_compute_tileoffset(const struct pipe_box *box, enum pipe_format
> > format,
> > + size_t stride, enum etna_surface_layout layout)
> > +{
> > + size_t offset;
> > + unsigned x = box->x, y = box->y;
> > +
> > + switch (layout) {
> > + case ETNA_LAYOUT_LINEAR:
> > + offset = y * stride + x * util_format_get_blocksize(format);
> > + break;
> > + case ETNA_LAYOUT_MULTI_TILED:
> > + y >>= 1;
> > + /* fall-through */
> > + case ETNA_LAYOUT_TILED:
> > + offset = (y & ~0x03) * stride +
> > + util_format_get_blocksize(format) * ((x & ~0x03) << 2);
> > + break;
> > + case ETNA_LAYOUT_MULTI_SUPERTILED:
> > + y >>= 1;
> > + /* fall-through */
> > + case ETNA_LAYOUT_SUPER_TILED:
> > + offset = (y & ~0x3f) * stride +
> > + util_format_get_blocksize(format) * ((x & ~0x3f) << 6);
> > + break;
> > + default:
> > + unreachable("invalid resource layout");
> > + }
> > +
> > + return offset;
>
> Maybe add assertions that the passed-in coordinates are really tile-aligned
> for the layout type, this could catch some bugs.
Makes a lot of sense, I'll do that.
> > +}
> > +
> > static bool
> > etna_try_rs_blit(struct pipe_context *pctx,
> > const struct pipe_blit_info *blit_info)
> > @@ -399,14 +431,32 @@ etna_try_rs_blit(struct pipe_context *pctx,
> > unsigned dst_format = etna_compatible_rs_format(blit_info->dst.format);
> > if (translate_rs_format(src_format) == ETNA_NO_MATCH ||
> > translate_rs_format(dst_format) == ETNA_NO_MATCH ||
> > - blit_info->scissor_enable || blit_info->src.box.x != 0 ||
> > - blit_info->src.box.y != 0 || blit_info->dst.box.x != 0 ||
> > - blit_info->dst.box.y != 0 ||
> > + blit_info->scissor_enable ||
> > blit_info->dst.box.depth != blit_info->src.box.depth ||
> > blit_info->dst.box.depth != 1) {
> > return FALSE;
> > }
> >
> > + unsigned w_mask, h_mask;
> > +
> > + if (src->layout & ETNA_LAYOUT_BIT_SUPER) {
> > + w_mask = h_mask = 0x3f;
> > + } else {
> > + w_mask = ETNA_RS_WIDTH_MASK;
> > + h_mask = ((ETNA_RS_HEIGHT_MASK + 1) * ctx->screen->specs.pixel_pipes
> > - 1);
> > + }
> > + if ((blit_info->src.box.x & w_mask) || (blit_info->src.box.y & h_mask))
> > + return FALSE;
> > +
> > + if (dst->layout & ETNA_LAYOUT_BIT_SUPER) {
> > + w_mask = h_mask = 0x3f;
> > + } else {
> > + w_mask = ETNA_RS_WIDTH_MASK;
> > + h_mask = ((ETNA_RS_HEIGHT_MASK + 1) * ctx->screen->specs.pixel_pipes
> > - 1);
> > + }
> > + if ((blit_info->dst.box.x & w_mask) || (blit_info->dst.box.y & h_mask))
> > + return FALSE;
> > +
> > /* Ensure that the Z coordinate is sane */
> > if (dst->base.target != PIPE_TEXTURE_CUBE)
> > assert(blit_info->dst.box.z == 0);
> > @@ -426,10 +476,18 @@ etna_try_rs_blit(struct pipe_context *pctx,
> > assert(blit_info->dst.box.x + blit_info->dst.box.width <=
> > dst_lev->padded_width);
> > assert(blit_info->dst.box.y + blit_info->dst.box.height <=
> > dst_lev->padded_height);
> >
> > - unsigned src_offset =
> > - src_lev->offset + blit_info->src.box.z * src_lev->layer_stride;
> > - unsigned dst_offset =
> > - dst_lev->offset + blit_info->dst.box.z * dst_lev->layer_stride;
> > + unsigned src_offset = src_lev->offset +
> > + blit_info->src.box.z * src_lev->layer_stride +
> > + etna_compute_tileoffset(&blit_info->src.box,
> > + blit_info->src.format,
> > + src_lev->stride,
> > + src->layout);
>
> Maybe include the z-computation in etna_compute_tileoffset as
> well - this would be future-compatible with formats have 3D tiles instead of
> a stack of 2D ones (thinking of ASTC).
I would like to keep this as simple as possible for now, so I'm not
really fond of adding complexity for cases that I can't test right now.
Regards,
Lucas
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
