Mesa (master): nouveau: Use _NEW_SCISSOR instead of hooking through dd_function_table

[Ian Romanick]

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

Author: Ian Romanick <ian.d.romanick at intel.com>
Date:   Fri Nov  1 14:56:53 2013 -0700

nouveau: Use _NEW_SCISSOR instead of hooking through dd_function_table

This will enable removing the dd_function_table::Scissor hook in the
near future.

Signed-off-by: Ian Romanick <ian.d.romanick at intel.com>
Reviewed-by: Francisco Jerez <currojerez at riseup.net>

---

 src/mesa/drivers/dri/nouveau/nouveau_state.c |   10 +++-------
 1 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/src/mesa/drivers/dri/nouveau/nouveau_state.c b/src/mesa/drivers/dri/nouveau/nouveau_state.c
index 16b7acc..3e7ed21 100644
--- a/src/mesa/drivers/dri/nouveau/nouveau_state.c
+++ b/src/mesa/drivers/dri/nouveau/nouveau_state.c
@@ -337,12 +337,6 @@ nouveau_render_mode(struct gl_context *ctx, GLenum mode)
 }
 
 static void
-nouveau_scissor(struct gl_context *ctx, GLint x, GLint y, GLsizei w, GLsizei h)
-{
-	context_dirty(ctx, SCISSOR);
-}
-
-static void
 nouveau_shade_model(struct gl_context *ctx, GLenum mode)
 {
 	context_dirty(ctx, SHADE_MODEL);
@@ -471,6 +465,9 @@ nouveau_update_state(struct gl_context *ctx, GLbitfield new_state)
 			context_dirty_i(ctx, TEX_MAT, i);
 	}
 
+	if (new_state & _NEW_SCISSOR)
+		context_dirty(ctx, SCISSOR);
+
 	if (new_state & _NEW_VIEWPORT)
 		context_dirty(ctx, VIEWPORT);
 
@@ -530,7 +527,6 @@ nouveau_state_init(struct gl_context *ctx)
 	ctx->Driver.PolygonOffset = nouveau_polygon_offset;
 	ctx->Driver.PolygonStipple = nouveau_polygon_stipple;
 	ctx->Driver.RenderMode = nouveau_render_mode;
-	ctx->Driver.Scissor = nouveau_scissor;
 	ctx->Driver.ShadeModel = nouveau_shade_model;
 	ctx->Driver.StencilFuncSeparate = nouveau_stencil_func_separate;
 	ctx->Driver.StencilMaskSeparate = nouveau_stencil_mask_separate;