Merge remote branch 'nouveau/gallium-0.1' into gallium-0.2

[mesa.git] / src / mesa / drivers / dri / r128 / r128_span.c

diff --git a/src/mesa/drivers/dri/r128/r128_span.c b/src/mesa/drivers/dri/r128/r128_span.c
index 25e57133cc3ad7a4045bc7877e00aab84d3ee8ed..dd177e0def5cceef049858cb7d5f454a02079393 100644 (file)
--- a/src/mesa/drivers/dri/r128/r128_span.c
+++ b/src/mesa/drivers/dri/r128/r128_span.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_span.c,v 1.8 2002/10/30 12:51:39 alanh Exp $ */
 /**************************************************************************
 
 Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
@@ -131,6 +130,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 /* 16-bit depth buffer functions
  */
+#define VALUE_TYPE GLushort
 
 #define WRITE_DEPTH_SPAN()                                             \
 do {                                                                   \
@@ -207,9 +207,11 @@ do {                                                                       \
 
 /* 24-bit depth, 8-bit stencil buffer functions
  */
+#define VALUE_TYPE GLuint
+
 #define WRITE_DEPTH_SPAN()                                             \
 do {                                                                   \
-   GLint buf[n];                                                       \
+   GLuint buf[n];                                                      \
    GLint i;                                                            \
    GLuint *readbuf = (GLuint *)((GLubyte *)sPriv->pFB +                        \
                                r128scrn->spanOffset);                  \
@@ -228,7 +230,7 @@ do {                                                                        \
 
 #define WRITE_DEPTH_PIXELS()                                           \
 do {                                                                   \
-   GLint buf[n];                                                       \
+   GLuint buf[n];                                                      \
    GLint ox[MAX_WIDTH];                                                        \
    GLint oy[MAX_WIDTH];                                                        \
    GLuint *readbuf = (GLuint *)((GLubyte *)sPriv->pFB +                        \
@@ -309,7 +311,7 @@ do {                                                                        \
  */
 #define WRITE_STENCIL_SPAN()                                           \
 do {                                                                   \
-   GLint buf[n];                                                       \
+   GLuint buf[n];                                                      \
    GLint i;                                                            \
    GLuint *readbuf = (GLuint *)((GLubyte *)sPriv->pFB +                        \
                                r128scrn->spanOffset);                  \
@@ -328,7 +330,7 @@ do {                                                                        \
 
 #define WRITE_STENCIL_PIXELS()                                         \
 do {                                                                   \
-   GLint buf[n];                                                       \
+   GLuint buf[n];                                                      \
    GLint ox[MAX_WIDTH];                                                        \
    GLint oy[MAX_WIDTH];                                                        \
    GLuint *readbuf = (GLuint *)((GLubyte *)sPriv->pFB +                        \