Mesa (master): mesa: make use of NewWindowRectangles driver flags
Samuel Pitoiset
hakzsam at kemper.freedesktop.org
Tue Jun 6 09:53:23 UTC 2017
Module: Mesa
Branch: master
Commit: b9f9bad4ebbf534a839ef539d75bfaabee6e0c42
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=b9f9bad4ebbf534a839ef539d75bfaabee6e0c42
Author: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Date: Fri Jun 2 14:31:49 2017 +0200
mesa: make use of NewWindowRectangles driver flags
Now, st_update_window_rectangles() won't be called when the
scissor is going to be updated.
Signed-off-by: Samuel Pitoiset <samuel.pitoiset at gmail.com>
Reviewed-by: Marek Olšák <marek.olsak at amd.com>
---
src/mesa/main/scissor.c | 4 +++-
src/mesa/state_tracker/st_context.c | 4 ++--
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/mesa/main/scissor.c b/src/mesa/main/scissor.c
index fe2e4dbff6..13934f9ca2 100644
--- a/src/mesa/main/scissor.c
+++ b/src/mesa/main/scissor.c
@@ -253,7 +253,9 @@ _mesa_WindowRectanglesEXT(GLenum mode, GLsizei count, const GLint *box)
box += 4;
}
- FLUSH_VERTICES(ctx, _NEW_SCISSOR);
+ FLUSH_VERTICES(ctx, 0);
+ ctx->NewDriverState |= ctx->DriverFlags.NewWindowRectangles;
+
memcpy(ctx->Scissor.WindowRects, newval,
sizeof(struct gl_scissor_rect) * count);
ctx->Scissor.NumWindowRects = count;
diff --git a/src/mesa/state_tracker/st_context.c b/src/mesa/state_tracker/st_context.c
index c901764668..8a5dd2f725 100644
--- a/src/mesa/state_tracker/st_context.c
+++ b/src/mesa/state_tracker/st_context.c
@@ -193,8 +193,7 @@ void st_invalidate_state(struct gl_context * ctx, GLbitfield new_state)
if (new_state & _NEW_SCISSOR)
st->dirty |= ST_NEW_RASTERIZER |
- ST_NEW_SCISSOR |
- ST_NEW_WINDOW_RECTANGLES;
+ ST_NEW_SCISSOR;
if (new_state & _NEW_FOG)
st->dirty |= ST_NEW_FS_STATE;
@@ -514,6 +513,7 @@ static void st_init_driver_flags(struct gl_driver_flags *f)
f->NewAtomicBuffer = ST_NEW_ATOMIC_BUFFER;
f->NewShaderStorageBuffer = ST_NEW_STORAGE_BUFFER;
f->NewImageUnits = ST_NEW_IMAGE_UNITS;
+ f->NewWindowRectangles = ST_NEW_WINDOW_RECTANGLES;
}
struct st_context *st_create_context(gl_api api, struct pipe_context *pipe,
More information about the mesa-commit
mailing list