1 files changed, 10 insertions, 18 deletions

diff --git a/xc/extras/Mesa/src/zoom.c b/xc/extras/Mesa/src/zoom.c
index b569cdad1..54a751515 100644
--- a/xc/extras/Mesa/src/zoom.c
+++ b/xc/extras/Mesa/src/zoom.c
@@ -1,8 +1,7 @@
-/* $Id: zoom.c,v 1.1.1.1 2000/01/06 13:27:10 faith Exp $ */
 
 /*
  * Mesa 3-D graphics library
- * Version:  3.1
+ * Version:  3.3
  * 
  * Copyright (C) 1999  Brian Paul   All Rights Reserved.
  * 
@@ -25,17 +24,10 @@
  */
 
 
-
-
-
 #ifdef PC_HEADER
 #include "all.h"
 #else
-#ifndef XFree86Server
-#include <assert.h>
-#else
-#include "GL/xf86glx.h"
-#endif
+#include "glheader.h"
 #include "macros.h"
 #include "span.h"
 #include "stencil.h"
@@ -63,7 +55,7 @@ gl_write_zoomed_rgba_span( GLcontext *ctx,
    GLint i, j, skipcol;
    GLubyte zrgba[MAX_WIDTH][4];  /* zoomed pixel colors */
    GLdepth zdepth[MAX_WIDTH];  /* zoomed depth values */
-   GLint maxwidth = MIN2( ctx->Buffer->Width, MAX_WIDTH );
+   GLint maxwidth = MIN2( ctx->DrawBuffer->Width, MAX_WIDTH );
    const GLuint *srcRGBA32 = (const GLuint *) rgba;
    GLuint *dstRGBA32 = (GLuint *) zrgba;
 
@@ -95,7 +87,7 @@ gl_write_zoomed_rgba_span( GLcontext *ctx,
       /* below window */
       return;
    }
-   if (r0>=ctx->Buffer->Height && r1>=ctx->Buffer->Height) {
+   if (r0>=ctx->DrawBuffer->Height && r1>=ctx->DrawBuffer->Height) {
       /* above window */
       return;
    }
@@ -153,7 +145,7 @@ gl_write_zoomed_rgb_span( GLcontext *ctx,
    GLint i, j, skipcol;
    GLubyte zrgba[MAX_WIDTH][4];  /* zoomed pixel colors */
    GLdepth zdepth[MAX_WIDTH];  /* zoomed depth values */
-   GLint maxwidth = MIN2( ctx->Buffer->Width, MAX_WIDTH );
+   GLint maxwidth = MIN2( ctx->DrawBuffer->Width, MAX_WIDTH );
 
    /* compute width of output row */
    m = (GLint) ABSF( n * ctx->Pixel.ZoomX );
@@ -183,7 +175,7 @@ gl_write_zoomed_rgb_span( GLcontext *ctx,
       /* below window */
       return;
    }
-   if (r0>=ctx->Buffer->Height && r1>=ctx->Buffer->Height) {
+   if (r0>=ctx->DrawBuffer->Height && r1>=ctx->DrawBuffer->Height) {
       /* above window */
       return;
    }
@@ -250,7 +242,7 @@ gl_write_zoomed_index_span( GLcontext *ctx,
    GLint i, j, skipcol;
    GLuint zindexes[MAX_WIDTH];  /* zoomed color indexes */
    GLdepth zdepth[MAX_WIDTH];  /* zoomed depth values */
-   GLint maxwidth = MIN2( ctx->Buffer->Width, MAX_WIDTH );
+   GLint maxwidth = MIN2( ctx->DrawBuffer->Width, MAX_WIDTH );
 
    /* compute width of output row */
    m = (GLint) ABSF( n * ctx->Pixel.ZoomX );
@@ -280,7 +272,7 @@ gl_write_zoomed_index_span( GLcontext *ctx,
       /* below window */
       return;
    }
-   if (r0>=ctx->Buffer->Height && r1>=ctx->Buffer->Height) {
+   if (r0>=ctx->DrawBuffer->Height && r1>=ctx->DrawBuffer->Height) {
       /* above window */
       return;
    }
@@ -340,7 +332,7 @@ gl_write_zoomed_stencil_span( GLcontext *ctx,
    GLint r0, r1, row, r;
    GLint i, j, skipcol;
    GLstencil zstencil[MAX_WIDTH];  /* zoomed stencil values */
-   GLint maxwidth = MIN2( ctx->Buffer->Width, MAX_WIDTH );
+   GLint maxwidth = MIN2( ctx->DrawBuffer->Width, MAX_WIDTH );
 
    /* compute width of output row */
    m = (GLint) ABSF( n * ctx->Pixel.ZoomX );
@@ -370,7 +362,7 @@ gl_write_zoomed_stencil_span( GLcontext *ctx,
       /* below window */
       return;
    }
-   if (r0>=ctx->Buffer->Height && r1>=ctx->Buffer->Height) {
+   if (r0>=ctx->DrawBuffer->Height && r1>=ctx->DrawBuffer->Height) {
       /* above window */
       return;
    }