fdo-mirrors/mesa
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/mesa/mesa.git synced 2026-05-05 05:18:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

etnaviv: s/scissor_s/scissor

Browse source 
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>
This commit is contained in:
Christian Gmeiner 2020-03-22 11:16:58 +01:00 • committed by Marge Bot
parent 43b4eb394c
commit 22ee3eabca
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/gallium/drivers/etnaviv/etnaviv_clear_blit.c
View file

@ -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);

2
src/gallium/drivers/etnaviv/etnaviv_context.h
View file

@ -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 {

10
src/gallium/drivers/etnaviv/etnaviv_state.c
View file

@ -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;