summaryrefslogtreecommitdiffstats
path: root/src/mesa
diff options
context:
space:
mode:
authorIan Romanick <[email protected]>2013-11-01 14:56:53 -0700
committerIan Romanick <[email protected]>2013-11-05 07:50:19 -0800
commit7df7e730fb71249993c9dcabff4b5e7075a775f6 (patch)
tree8b69dd8663ba355e932fcba91f3bd6e77f34edd3 /src/mesa
parent3f30425424dee72c76df4195da24df8ef913af56 (diff)
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 <[email protected]> Reviewed-by: Francisco Jerez <[email protected]>
Diffstat (limited to 'src/mesa')
-rw-r--r--src/mesa/drivers/dri/nouveau/nouveau_state.c10
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 16b7acc0992..3e7ed210196 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;