Dave Reveman's scissor fix (bug 6222)

3 files changed, 26 insertions, 16 deletions

diff --git a/src/mesa/main/buffers.c b/src/mesa/main/buffers.c
index 58435e0ede..e266453814 100644
--- a/src/mesa/main/buffers.c
+++ b/src/mesa/main/buffers.c
@@ -653,20 +653,10 @@ _mesa_SampleCoverageARB(GLclampf value, GLboolean invert)
  * change flushes the vertices and notifies the driver via
  * the dd_function_table::Scissor callback.
  */
-void GLAPIENTRY
-_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height )
+void
+_mesa_set_scissor(GLcontext *ctx, 
+                  GLint x, GLint y, GLsizei width, GLsizei height)
 {
-   GET_CURRENT_CONTEXT(ctx);
-   ASSERT_OUTSIDE_BEGIN_END(ctx);
-
-   if (width < 0 || height < 0) {
-      _mesa_error( ctx, GL_INVALID_VALUE, "glScissor" );
-      return;
-   }
-
-   if (MESA_VERBOSE & VERBOSE_API)
-      _mesa_debug(ctx, "glScissor %d %d %d %d\n", x, y, width, height);
-
    if (x == ctx->Scissor.X &&
        y == ctx->Scissor.Y &&
        width == ctx->Scissor.Width &&
@@ -680,7 +670,25 @@ _mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height )
    ctx->Scissor.Height = height;
 
    if (ctx->Driver.Scissor)
-      ctx->Driver.Scissor( ctx, x, y, width, height );
+      ctx->Driver.Scissor(ctx, x, y, width, height);
+}
+
+
+void GLAPIENTRY
+_mesa_Scissor( GLint x, GLint y, GLsizei width, GLsizei height )
+{
+   GET_CURRENT_CONTEXT(ctx);
+   ASSERT_OUTSIDE_BEGIN_END(ctx);
+
+   if (width < 0 || height < 0) {
+      _mesa_error( ctx, GL_INVALID_VALUE, "glScissor" );
+      return;
+   }
+
+   if (MESA_VERBOSE & VERBOSE_API)
+      _mesa_debug(ctx, "glScissor %d %d %d %d\n", x, y, width, height);
+
+   _mesa_set_scissor(ctx, x, y, width, height);
 }
 
 
diff --git a/src/mesa/main/buffers.h b/src/mesa/main/buffers.h
index 0c7f68ee79..a3e59c1329 100644
--- a/src/mesa/main/buffers.h
+++ b/src/mesa/main/buffers.h
@@ -74,5 +74,8 @@ _mesa_init_scissor(GLcontext *ctx);
 extern void 
 _mesa_init_multisample(GLcontext *ctx);
 
+extern void
+_mesa_set_scissor(GLcontext *ctx, 
+                  GLint x, GLint y, GLsizei width, GLsizei height);
 
 #endif
diff --git a/src/mesa/main/context.c b/src/mesa/main/context.c
index 3baad5dba6..97018d7d27 100644
--- a/src/mesa/main/context.c
+++ b/src/mesa/main/context.c
@@ -1588,8 +1588,7 @@ _mesa_make_current( GLcontext *newCtx, GLframebuffer *drawBuffer,
          if (newCtx->FirstTimeCurrent) {
             /* set initial viewport and scissor size now */
             _mesa_set_viewport(newCtx, 0, 0, drawBuffer->Width, drawBuffer->Height);
-            newCtx->Scissor.Width = drawBuffer->Width;
-            newCtx->Scissor.Height = drawBuffer->Height;
+	    _mesa_set_scissor(newCtx, 0, 0, drawBuffer->Width, drawBuffer->Height );
          }
       }