From 2c3e0b5ac2512a637836d2c5d962213668fa8948 Mon Sep 17 00:00:00 2001 From: Christian Gmeiner Date: Sat, 15 Mar 2025 14:25:01 +0100 Subject: [PATCH] etnaviv: rs: Change param etna_get_rs_alignment_mask(..) This prepares etna_get_rs_alignment_mask(..) for the next commit. Signed-off-by: Christian Gmeiner Reviewed-by: Lucas Stach Part-of: --- src/gallium/drivers/etnaviv/etnaviv_rs.c | 11 +++++------ src/gallium/drivers/etnaviv/etnaviv_rs.h | 2 +- src/gallium/drivers/etnaviv/etnaviv_transfer.c | 2 +- 3 files changed, 7 insertions(+), 8 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_rs.c b/src/gallium/drivers/etnaviv/etnaviv_rs.c index 854e49d69e2..82bf16d2c98 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_rs.c +++ b/src/gallium/drivers/etnaviv/etnaviv_rs.c @@ -610,11 +610,10 @@ etna_compute_tileoffset(const struct pipe_box *box, enum pipe_format format, } static inline void -etna_get_rs_alignment_mask(const struct etna_context *ctx, +etna_get_rs_alignment_mask(const struct etna_screen *screen, const enum etna_surface_layout layout, unsigned int *width_mask, unsigned int *height_mask) { - struct etna_screen *screen = ctx->screen; unsigned int h_align, w_align; if (layout & ETNA_LAYOUT_BIT_SUPER) { @@ -713,7 +712,7 @@ etna_try_rs_blit(struct pipe_context *pctx, unsigned w_mask, h_mask; - etna_get_rs_alignment_mask(ctx, src->layout, &w_mask, &h_mask); + etna_get_rs_alignment_mask(ctx->screen, src->layout, &w_mask, &h_mask); if ((blit_info->src.box.x & w_mask) || (blit_info->src.box.y & h_mask)) { DBG("src x/y not properly aligned: %d %d", blit_info->src.box.x, @@ -721,7 +720,7 @@ etna_try_rs_blit(struct pipe_context *pctx, return false; } - etna_get_rs_alignment_mask(ctx, dst->layout, &w_mask, &h_mask); + etna_get_rs_alignment_mask(ctx->screen, dst->layout, &w_mask, &h_mask); if ((blit_info->dst.box.x & w_mask) || (blit_info->dst.box.y & h_mask)) { DBG("dst x/y not properly aligned: %d %d", blit_info->src.box.x, @@ -906,13 +905,13 @@ manual: } void -etna_align_box_for_rs(const struct etna_context *ctx, +etna_align_box_for_rs(const struct etna_screen *screen, const struct etna_resource *rsc, struct pipe_box *box) { unsigned w_align, h_align; - etna_get_rs_alignment_mask(ctx, rsc->layout, &w_align, &h_align); + etna_get_rs_alignment_mask(screen, rsc->layout, &w_align, &h_align); box->width += box->x & w_align; box->x = box->x & ~w_align; diff --git a/src/gallium/drivers/etnaviv/etnaviv_rs.h b/src/gallium/drivers/etnaviv/etnaviv_rs.h index 7e21de31c66..448c96ee7cd 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_rs.h +++ b/src/gallium/drivers/etnaviv/etnaviv_rs.h @@ -88,7 +88,7 @@ etna_compile_rs_state(struct etna_context *ctx, struct compiled_rs_state *cs, const struct rs_state *rs); void -etna_align_box_for_rs(const struct etna_context *ctx, +etna_align_box_for_rs(const struct etna_screen *screen, const struct etna_resource *rsc, struct pipe_box *box); diff --git a/src/gallium/drivers/etnaviv/etnaviv_transfer.c b/src/gallium/drivers/etnaviv/etnaviv_transfer.c index de5ed08eeb0..784f2d7635f 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_transfer.c +++ b/src/gallium/drivers/etnaviv/etnaviv_transfer.c @@ -298,7 +298,7 @@ etna_transfer_map(struct pipe_context *pctx, struct pipe_resource *prsc, /* Need to align the transfer region to satisfy RS restrictions, as we * really want to hit the RS blit path here. */ - etna_align_box_for_rs(ctx, rsc, &ptrans->box); + etna_align_box_for_rs(ctx->screen, rsc, &ptrans->box); } if ((usage & PIPE_MAP_READ) || !(usage & ETNA_PIPE_MAP_DISCARD_LEVEL))