Mesa (master): mesa: make use of NewScissorRect driver flags

[Samuel Pitoiset]

Module: Mesa
Branch: master
Commit: 328191f26c7494ff92daf7f1c891bb2aee6c8bd9
URL:    http://cgit.freedesktop.org/mesa/mesa/commit/?id=328191f26c7494ff92daf7f1c891bb2aee6c8bd9

Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date:   Tue Jun  6 15:21:43 2017 +0200

mesa: make use of NewScissorRect driver flags

Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Nicolai Hähnle <nicolai.haehnle at amd.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>

---

 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 c04c64ca3f..2f2e226ab9 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 743c7bde28..1c1c55afe3 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,