etnaviv: s/scissor_s/scissor

Signed-off-by: Christian Gmeiner <christian.gmeiner@gmail.com>
Reviewed-by: Jonathan Marek <jonathan@marek.ca>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/4278>

diff --git a/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c b/src/gallium/drivers/etnaviv/etnaviv_clear_blit.c
index a7a1844efde09d5e8d64400f08d1c79296dec7e2..4c288f553df41f0e39f4513b4b1bad9a31696cb3 100644 (file)
--- 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 cee20ab5784dea9899235f5a482851ea48d93399..5deda100cbb7a339f6c3c54f7201e6d3b04ec147 100644 (file)
--- 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 36e3611f512745a33be773824946167c1962240d..d1cf4711eff2d05a29e5ac282085b4a5cc716269 100644 (file)
--- 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;