replace GLdepth with GLuint

6 files changed, 14 insertions, 14 deletions

diff --git a/src/mesa/drivers/dri/ffb/ffb_context.h b/src/mesa/drivers/dri/ffb/ffb_context.h
index 33f6f7cff8..df1b65d748 100644
--- a/src/mesa/drivers/dri/ffb/ffb_context.h
+++ b/src/mesa/drivers/dri/ffb/ffb_context.h
@@ -294,13 +294,13 @@ do {	if ((STATE_MASK) & ~((FMESA)->state_dirty)) {	\
  * 1.0 would produce a value of 0x0fffffff in the actual Z
  * buffer, which is the maximum value.
  *
- * Mesa's depth type is a 32-bit int, so we use the following macro
+ * Mesa's depth type is a 32-bit uint, so we use the following macro
  * to convert to/from FFB hw Z values.  Note we also have to clear
  * out the top bits as that is where the Y (stencil) buffer is stored
  * and during hw Z buffer reads it is always there. (During writes
  * we tell the hw to discard those top 4 bits).
  */
-#define Z_TO_MESA(VAL)		((GLdepth)(((VAL) & 0x0fffffff) << (32 - 28)))
+#define Z_TO_MESA(VAL)		((GLuint)(((VAL) & 0x0fffffff) << (32 - 28)))
 #define Z_FROM_MESA(VAL)	(((GLuint)((GLdouble)(VAL))) >> (32 - 28))
 
 #endif /* !(_FFB_CONTEXT_H) */
diff --git a/src/mesa/drivers/dri/r128/r128_ioctl.c b/src/mesa/drivers/dri/r128/r128_ioctl.c
index 150d62577e..8f14854887 100644
--- a/src/mesa/drivers/dri/r128/r128_ioctl.c
+++ b/src/mesa/drivers/dri/r128/r128_ioctl.c
@@ -539,7 +539,7 @@ static void r128Clear( GLcontext *ctx, GLbitfield mask, GLboolean all,
 
 void r128WriteDepthSpanLocked( r128ContextPtr rmesa,
 			       GLuint n, GLint x, GLint y,
-			       const GLdepth depth[],
+			       const GLuint depth[],
 			       const GLubyte mask[] )
 {
    drm_clip_rect_t *pbox = rmesa->pClipRects;
@@ -602,7 +602,7 @@ void r128WriteDepthSpanLocked( r128ContextPtr rmesa,
 
 void r128WriteDepthPixelsLocked( r128ContextPtr rmesa, GLuint n,
 				 const GLint x[], const GLint y[],
-				 const GLdepth depth[],
+				 const GLuint depth[],
 				 const GLubyte mask[] )
 {
    drm_clip_rect_t *pbox = rmesa->pClipRects;
diff --git a/src/mesa/drivers/dri/r128/r128_ioctl.h b/src/mesa/drivers/dri/r128/r128_ioctl.h
index d2f2dded8b..95779f09be 100644
--- a/src/mesa/drivers/dri/r128/r128_ioctl.h
+++ b/src/mesa/drivers/dri/r128/r128_ioctl.h
@@ -75,11 +75,11 @@ extern void r128FireBlitLocked( r128ContextPtr rmesa, drmBufPtr buffer,
 
 extern void r128WriteDepthSpanLocked( r128ContextPtr rmesa,
 				      GLuint n, GLint x, GLint y,
-				      const GLdepth depth[],
+				      const GLuint depth[],
 				      const GLubyte mask[] );
 extern void r128WriteDepthPixelsLocked( r128ContextPtr rmesa, GLuint n,
 					const GLint x[], const GLint y[],
-					const GLdepth depth[],
+					const GLuint depth[],
 					const GLubyte mask[] );
 extern void r128ReadDepthSpanLocked( r128ContextPtr rmesa,
 				     GLuint n, GLint x, GLint y );
diff --git a/src/mesa/drivers/glide/fxddspan.c b/src/mesa/drivers/glide/fxddspan.c
index 71f7e71a46..3ea9f73dd2 100644
--- a/src/mesa/drivers/glide/fxddspan.c
+++ b/src/mesa/drivers/glide/fxddspan.c
@@ -453,7 +453,7 @@ static void fxReadRGBASpan_ARGB8888 (const GLcontext * ctx,
 
 static void
 fxReadDepthSpan_Z16(GLcontext * ctx, struct gl_renderbuffer *rb,
-		    GLuint n, GLint x, GLint y, GLdepth depth[])
+		    GLuint n, GLint x, GLint y, GLuint depth[])
 {
    fxMesaContext fxMesa = FX_CONTEXT(ctx);
    GLint bottom = fxMesa->height - 1;
@@ -473,7 +473,7 @@ fxReadDepthSpan_Z16(GLcontext * ctx, struct gl_renderbuffer *rb,
 
 static void
 fxReadDepthSpan_Z24(GLcontext * ctx, struct gl_renderbuffer *rb,
-		    GLuint n, GLint x, GLint y, GLdepth depth[])
+		    GLuint n, GLint x, GLint y, GLuint depth[])
 {
    fxMesaContext fxMesa = FX_CONTEXT(ctx);
    GLint bottom = fxMesa->height - 1;
diff --git a/src/mesa/drivers/glide/fxdrv.h b/src/mesa/drivers/glide/fxdrv.h
index 240428c06d..50dc483e18 100644
--- a/src/mesa/drivers/glide/fxdrv.h
+++ b/src/mesa/drivers/glide/fxdrv.h
@@ -674,18 +674,18 @@ extern void fxDDColorMask(GLcontext * ctx,
 			  GLboolean r, GLboolean g, GLboolean b, GLboolean a);
 
 extern void fxDDWriteDepthSpan(GLcontext * ctx, GLuint n, GLint x, GLint y,
-			       const GLdepth depth[], const GLubyte mask[]);
+			       const GLuint depth[], const GLubyte mask[]);
 
 extern void fxDDReadDepthSpan(GLcontext * ctx, GLuint n, GLint x, GLint y,
-			      GLdepth depth[]);
+			      GLuint depth[]);
 
 extern void fxDDWriteDepthPixels(GLcontext * ctx, GLuint n,
 				 const GLint x[], const GLint y[],
-				 const GLdepth depth[], const GLubyte mask[]);
+				 const GLuint depth[], const GLubyte mask[]);
 
 extern void fxDDReadDepthPixels(GLcontext * ctx, GLuint n,
 				const GLint x[], const GLint y[],
-				GLdepth depth[]);
+				GLuint depth[]);
 
 extern void fxDDShadeModel(GLcontext * ctx, GLenum mode);
 
diff --git a/src/mesa/drivers/osmesa/osmesa.c b/src/mesa/drivers/osmesa/osmesa.c
index 79ad3a7edc..e4cb27d116 100644
--- a/src/mesa/drivers/osmesa/osmesa.c
+++ b/src/mesa/drivers/osmesa/osmesa.c
@@ -464,7 +464,7 @@ osmesa_choose_line_function( GLcontext *ctx )
    GLuint i;							\
    GLchan *img = PIXELADDR4(span.x, span.y); 			\
    for (i = 0; i < span.end; i++, img += 4) {			\
-      const GLdepth z = FixedToDepth(span.z);			\
+      const GLuint z = FixedToDepth(span.z);			\
       if (z < zRow[i]) {					\
          PACK_RGBA(img, FixedToChan(span.red),			\
             FixedToChan(span.green), FixedToChan(span.blue),	\
@@ -501,7 +501,7 @@ osmesa_choose_line_function( GLcontext *ctx )
    GLuint i;						\
    GLuint *img = (GLuint *) PIXELADDR4(span.x, span.y);	\
    for (i = 0; i < span.end; i++) {			\
-      const GLdepth z = FixedToDepth(span.z);		\
+      const GLuint z = FixedToDepth(span.z);		\
       if (z < zRow[i]) {				\
          img[i] = pixel;				\
          zRow[i] = z;					\