From f6d7cd4a11e70b816733cff681dde7d03588d1c8 Mon Sep 17 00:00:00 2001 From: Ian Romanick Date: Tue, 7 Jan 2014 19:06:17 -0800 Subject: [PATCH] mesa: Add an index parameter to _mesa_set_scissor Signed-off-by: Ian Romanick Reviewed-by: Kenneth Graunke --- src/mesa/main/attrib.c | 2 +- src/mesa/main/context.c | 2 +- src/mesa/main/scissor.c | 6 +++--- src/mesa/main/scissor.h | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c index 3a6bf05eee9..f55433ea65f 100644 --- a/src/mesa/main/attrib.c +++ b/src/mesa/main/attrib.c @@ -1271,7 +1271,7 @@ _mesa_PopAttrib(void) { const struct gl_scissor_attrib *scissor; scissor = (const struct gl_scissor_attrib *) attr->data; - _mesa_set_scissor(ctx, + _mesa_set_scissor(ctx, 0, scissor->ScissorArray[0].X, scissor->ScissorArray[0].Y, scissor->ScissorArray[0].Width, diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c index 5af0c02cfa9..91fcbd284a6 100644 --- a/src/mesa/main/context.c +++ b/src/mesa/main/context.c @@ -1438,7 +1438,7 @@ _mesa_check_init_viewport(struct gl_context *ctx, GLuint width, GLuint height) */ ctx->ViewportInitialized = GL_TRUE; _mesa_set_viewport(ctx, 0, 0, 0, width, height); - _mesa_set_scissor(ctx, 0, 0, width, height); + _mesa_set_scissor(ctx, 0, 0, 0, width, height); } } diff --git a/src/mesa/main/scissor.c b/src/mesa/main/scissor.c index cc4ce69c361..9266f1e9810 100644 --- a/src/mesa/main/scissor.c +++ b/src/mesa/main/scissor.c @@ -70,7 +70,7 @@ _mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height ) return; } - _mesa_set_scissor(ctx, x, y, width, height); + _mesa_set_scissor(ctx, 0, x, y, width, height); } @@ -88,10 +88,10 @@ _mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height ) * the dd_function_table::Scissor callback. */ void -_mesa_set_scissor(struct gl_context *ctx, +_mesa_set_scissor(struct gl_context *ctx, unsigned idx, GLint x, GLint y, GLsizei width, GLsizei height) { - set_scissor_no_notify(ctx, 0, x, y, width, height); + set_scissor_no_notify(ctx, idx, x, y, width, height); if (ctx->Driver.Scissor) ctx->Driver.Scissor(ctx); diff --git a/src/mesa/main/scissor.h b/src/mesa/main/scissor.h index 0d7e2010a02..5726a006134 100644 --- a/src/mesa/main/scissor.h +++ b/src/mesa/main/scissor.h @@ -36,7 +36,7 @@ _mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height ); extern void -_mesa_set_scissor(struct gl_context *ctx, +_mesa_set_scissor(struct gl_context *ctx, unsigned idx, GLint x, GLint y, GLsizei width, GLsizei height); -- 2.30.2