Remove CVS keywords.

[mesa.git] / src / mesa / drivers / dri / r128 / r128_texobj.h

diff --git a/src/mesa/drivers/dri/r128/r128_texobj.h b/src/mesa/drivers/dri/r128/r128_texobj.h
index e2ff1ac24d3d8656dcd23a435588eb72e3661c73..efbbb2df781a88a5e2d4da86aea334988a53fde0 100644 (file)
--- a/src/mesa/drivers/dri/r128/r128_texobj.h
+++ b/src/mesa/drivers/dri/r128/r128_texobj.h
@@ -1,4 +1,3 @@
-/* $XFree86: xc/lib/GL/mesa/src/drv/r128/r128_texobj.h,v 1.5 2002/02/22 21:44:58 dawes Exp $ */
 /**************************************************************************
 
 Copyright 1999, 2000 ATI Technologies Inc. and Precision Insight, Inc.,
@@ -36,8 +35,7 @@ USE OR OTHER DEALINGS IN THE SOFTWARE.
 #ifndef _R128_TEXOBJ_H_
 #define _R128_TEXOBJ_H_
 
-#include "r128_sarea.h"
-#include "mm.h"
+#include "main/mm.h"
 
 /* Individual texture image information.
  */
@@ -54,16 +52,16 @@ typedef struct r128_tex_obj r128TexObj, *r128TexObjPtr;
 struct r128_tex_obj {
    driTextureObject   base;
 
-   CARD32 bufAddr;                     /* Offset to start of locally
+   uint32_t bufAddr;                   /* Offset to start of locally
                                           shared texture block */
 
    GLuint age;
    r128TexImage image[R128_MAX_TEXTURE_LEVELS]; /* Image data for all
                                                   mipmap levels */
 
-   CARD32 textureFormat;               /* Actual hardware format */
+   uint32_t textureFormat;             /* Actual hardware format */
 
-   r128_texture_regs_t setup;          /* Setup regs for texture */
+   drm_r128_texture_regs_t setup;              /* Setup regs for texture */
 };
 
 #endif /* _R128_TEXOBJ_H_ */