From 328191f26c7494ff92daf7f1c891bb2aee6c8bd9 Mon Sep 17 00:00:00 2001 From: Samuel Pitoiset Date: Tue, 6 Jun 2017 15:21:43 +0200 Subject: [PATCH] mesa: make use of NewScissorRect driver flags MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Signed-off-by: Samuel Pitoiset Reviewed-by: Nicolai Hähnle Reviewed-by: Marek Olšák --- src/mesa/main/scissor.c | 2 ++ src/mesa/state_tracker/st_context.c | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/src/mesa/main/scissor.c b/src/mesa/main/scissor.c index c04c64ca3fe..2f2e226ab93 100644 --- a/src/mesa/main/scissor.c +++ b/src/mesa/main/scissor.c @@ -49,6 +49,8 @@ set_scissor_no_notify(struct gl_context *ctx, unsigned idx, return; FLUSH_VERTICES(ctx, _NEW_SCISSOR); + ctx->NewDriverState |= ctx->DriverFlags.NewScissorRect; + ctx->Scissor.ScissorArray[idx].X = x; ctx->Scissor.ScissorArray[idx].Y = y; ctx->Scissor.ScissorArray[idx].Width = width; diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c index 743c7bde280..1c1c55afe3c 100644 --- a/src/mesa/state_tracker/st_context.c +++ b/src/mesa/state_tracker/st_context.c @@ -201,8 +201,7 @@ st_invalidate_state(struct gl_context * ctx) st->dirty |= ST_NEW_RASTERIZER; if (new_state & _NEW_SCISSOR) - st->dirty |= ST_NEW_RASTERIZER | - ST_NEW_SCISSOR; + st->dirty |= ST_NEW_RASTERIZER; if (new_state & _NEW_FOG) st->dirty |= ST_NEW_FS_STATE; @@ -523,6 +522,7 @@ static void st_init_driver_flags(struct st_context *st) f->NewImageUnits = ST_NEW_IMAGE_UNITS; f->NewWindowRectangles = ST_NEW_WINDOW_RECTANGLES; f->NewFramebufferSRGB = ST_NEW_FRAMEBUFFER; + f->NewScissorRect = ST_NEW_SCISSOR; } struct st_context *st_create_context(gl_api api, struct pipe_context *pipe, -- 2.30.2