Module: Mesa Branch: master Commit: 22ee3eabcad25b3819aad7ca168315b540a84769 URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=22ee3eabcad25b3819aad7ca168315b540a84769
Author: Christian Gmeiner <[email protected]> Date: Sun Mar 22 11:16:58 2020 +0100 etnaviv: s/scissor_s/scissor Signed-off-by: Christian Gmeiner <[email protected]> Reviewed-by: Jonathan Marek <[email protected]> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4278> --- src/gallium/drivers/etnaviv/etnaviv_clear_blit.c | 2 +- src/gallium/drivers/etnaviv/etnaviv_context.h | 2 +- src/gallium/drivers/etnaviv/etnaviv_state.c | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c b/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c index a7a1844efde..4c288f553df 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c +++ b/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c @@ -53,7 +53,7 @@ etna_blit_save_state(struct etna_context *ctx) util_blitter_save_vertex_shader(ctx->blitter, ctx->shader.bind_vs); util_blitter_save_rasterizer(ctx->blitter, ctx->rasterizer); util_blitter_save_viewport(ctx->blitter, &ctx->viewport_s); - util_blitter_save_scissor(ctx->blitter, &ctx->scissor_s); + util_blitter_save_scissor(ctx->blitter, &ctx->scissor); util_blitter_save_fragment_shader(ctx->blitter, ctx->shader.bind_fs); util_blitter_save_blend(ctx->blitter, ctx->blend); util_blitter_save_depth_stencil_alpha(ctx->blitter, ctx->zsa); diff --git a/src/gallium/drivers/etnaviv/etnaviv_context.h b/src/gallium/drivers/etnaviv/etnaviv_context.h index cee20ab5784..5deda100cbb 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_context.h +++ b/src/gallium/drivers/etnaviv/etnaviv_context.h @@ -178,7 +178,7 @@ struct etna_context { struct pipe_framebuffer_state framebuffer_s; struct pipe_stencil_ref stencil_ref_s; struct pipe_viewport_state viewport_s; - struct pipe_scissor_state scissor_s; + struct pipe_scissor_state scissor; /* stats/counters */ struct { diff --git a/src/gallium/drivers/etnaviv/etnaviv_state.c b/src/gallium/drivers/etnaviv/etnaviv_state.c index 36e3611f512..d1cf4711eff 100644 --- a/src/gallium/drivers/etnaviv/etnaviv_state.c +++ b/src/gallium/drivers/etnaviv/etnaviv_state.c @@ -386,7 +386,7 @@ etna_set_scissor_states(struct pipe_context *pctx, unsigned start_slot, assert(ss->minx <= ss->maxx); assert(ss->miny <= ss->maxy); - ctx->scissor_s = *ss; + ctx->scissor = *ss; ctx->dirty |= ETNA_DIRTY_SCISSOR; } @@ -670,10 +670,10 @@ etna_update_clipping(struct etna_context *ctx) /* clip against scissor */ if (rasterizer->scissor) { - scissor_left = MAX2(ctx->scissor_s.minx, scissor_left); - scissor_top = MAX2(ctx->scissor_s.miny, scissor_top); - scissor_right = MIN2(ctx->scissor_s.maxx, scissor_right); - scissor_bottom = MIN2(ctx->scissor_s.maxy, scissor_bottom); + scissor_left = MAX2(ctx->scissor.minx, scissor_left); + scissor_top = MAX2(ctx->scissor.miny, scissor_top); + scissor_right = MIN2(ctx->scissor.maxx, scissor_right); + scissor_bottom = MIN2(ctx->scissor.maxy, scissor_bottom); } ctx->clipping.minx = scissor_left; _______________________________________________ mesa-commit mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/mesa-commit
