Merge commit 'origin/gallium-0.1'

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

diff --git a/src/mesa/drivers/dri/r128/r128_tex.c b/src/mesa/drivers/dri/r128/r128_tex.c
index ee58bca35822416a146acd8cb25398050d14d84d..3fc9c06cfa2ed574d59d7d386ae1611f0ff95471 100644 (file)
--- a/src/mesa/drivers/dri/r128/r128_tex.c
+++ b/src/mesa/drivers/dri/r128/r128_tex.c
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_tex.c,v 1.14 2002/11/05 17:46:08 tsi Exp $ */
 /**************************************************************************
 
 Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
@@ -462,9 +461,9 @@ static void r128TexEnv( GLcontext *ctx, GLenum target,
 
    case GL_TEXTURE_LOD_BIAS:
       {
-        u_int32_t t = rmesa->setup.tex_cntl_c;
+        uint32_t t = rmesa->setup.tex_cntl_c;
         GLint bias;
-        u_int32_t b;
+        uint32_t b;
 
         /* GTH: This isn't exactly correct, but gives good results up to a
          * certain point.  It is better than completely ignoring the LOD
@@ -484,7 +483,7 @@ static void r128TexEnv( GLcontext *ctx, GLenum target,
            bias = 127;
         }
 
-        b = (u_int32_t)bias & 0xff;
+        b = (uint32_t)bias & 0xff;
         t &= ~R128_LOD_BIAS_MASK;
         t |= (b << R128_LOD_BIAS_SHIFT);