Module: Mesa Branch: master Commit: 5278e9dea7e6b91fb6a915b775da5e14dcbca811 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=5278e9dea7e6b91fb6a915b775da5e14dcbca811
Author: Christian Gmeiner <[email protected]> Date: Sun Mar 22 22:42:35 2020 +0100 etnaviv: compiled_framebuffer_state: get rid of SE_SCISSOR_* Signed-off-by: Christian Gmeiner <[email protected]> Reviewed-by: Jonathan Marek <[email protected]> Tested-by: Marge Bot <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4278> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4278> --- src/gallium/drivers/etnaviv/etnaviv_internal.h | 4 ---- src/gallium/drivers/etnaviv/etnaviv_state.c | 19 +++++-------------- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_internal.h b/src/gallium/drivers/etnaviv/etnaviv_internal.h index 0a846c4fbc1..fabd43199ee 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_internal.h +++ b/src/gallium/drivers/etnaviv/etnaviv_internal.h @@ -187,10 +187,6 @@ struct compiled_framebuffer_state { struct etna_reloc PE_PIPE_COLOR_ADDR[ETNA_MAX_PIXELPIPES]; uint32_t PE_COLOR_STRIDE; uint32_t PE_MEM_CONFIG; - uint32_t SE_SCISSOR_LEFT; - uint32_t SE_SCISSOR_TOP; - uint32_t SE_SCISSOR_RIGHT; - uint32_t SE_SCISSOR_BOTTOM; uint32_t RA_MULTISAMPLE_UNK00E04; uint32_t RA_MULTISAMPLE_UNK00E10[VIVS_RA_MULTISAMPLE_UNK00E10__LEN]; uint32_t RA_CENTROID_TABLE[VIVS_RA_CENTROID_TABLE__LEN]; diff --git a/src/gallium/drivers/etnaviv/etnaviv_state.c b/src/gallium/drivers/etnaviv/etnaviv_state.c index d1cf4711eff..5559cc54f0b 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_state.c +++ b/src/gallium/drivers/etnaviv/etnaviv_state.c @@ -349,12 +349,6 @@ etna_set_framebuffer_state(struct pipe_context *pctx, break; } - /* Scissor setup */ - cs->SE_SCISSOR_LEFT = 0; /* affected by rasterizer and scissor state as well */ - cs->SE_SCISSOR_TOP = 0; - cs->SE_SCISSOR_RIGHT = fb->width; - cs->SE_SCISSOR_BOTTOM = fb->height; - cs->TS_MEM_CONFIG = ts_mem_config; cs->PE_MEM_CONFIG = pe_mem_config; @@ -657,16 +651,13 @@ static bool etna_update_clipping(struct etna_context *ctx) { const struct etna_rasterizer_state *rasterizer = etna_rasterizer_state(ctx->rasterizer); + const struct pipe_framebuffer_state *fb = &ctx->framebuffer_s; /* clip framebuffer against viewport */ - uint32_t scissor_left = - MAX2(ctx->framebuffer.SE_SCISSOR_LEFT, ctx->viewport.SE_SCISSOR_LEFT); - uint32_t scissor_top = - MAX2(ctx->framebuffer.SE_SCISSOR_TOP, ctx->viewport.SE_SCISSOR_TOP); - uint32_t scissor_right = - MIN2(ctx->framebuffer.SE_SCISSOR_RIGHT, ctx->viewport.SE_SCISSOR_RIGHT); - uint32_t scissor_bottom = - MIN2(ctx->framebuffer.SE_SCISSOR_BOTTOM, ctx->viewport.SE_SCISSOR_BOTTOM); + uint32_t scissor_left = ctx->viewport.SE_SCISSOR_LEFT; + uint32_t scissor_top = ctx->viewport.SE_SCISSOR_TOP; + uint32_t scissor_right = MIN2(fb->width, ctx->viewport.SE_SCISSOR_RIGHT); + uint32_t scissor_bottom = MIN2(fb->height, ctx->viewport.SE_SCISSOR_BOTTOM); /* clip against scissor */ if (rasterizer->scissor) { _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
