mesa: Add an index parameter to _mesa_set_scissor

Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
Reviewed-by: Kenneth Graunke <kenneth@whitecape.org>

diff --git a/src/mesa/main/attrib.c b/src/mesa/main/attrib.c
index 3a6bf05eee97cfccd2db44ee3d7eacbfaea21647..f55433ea65fa49c7e65a4a4559b7ab511694e128 100644 (file)
--- 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 5af0c02cfa9406fba4d694977f07705bea5a24fe..91fcbd284a69d86335401df3f18dbf5372c51883 100644 (file)
--- 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 cc4ce69c361c90831d9dc06256407cd4219dcdf7..9266f1e981089f1f82a0781b43e87affef7c470f 100644 (file)
--- 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 0d7e2010a0258c9b6bf6a1b16d6a58f148ee0faf..5726a006134b141875f6f072f67624b9ccdaae8c 100644 (file)
--- 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);