uint*t -> u_int*t changes

[mesa.git] / src / mesa / drivers / dri / gamma / gamma_context.h

diff --git a/src/mesa/drivers/dri/gamma/gamma_context.h b/src/mesa/drivers/dri/gamma/gamma_context.h
index 233f5ff06472638f09d5339ab3f62c68ddf4089b..6dd458bc95c063075f614e8ac3da4b8dd1ee4921 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_context.h
+++ b/src/mesa/drivers/dri/gamma/gamma_context.h
@@ -160,13 +160,13 @@ struct gamma_texture_object_t {
       int internalFormat;
    } image[GAMMA_TEX_MAXLEVELS];
 
-   int32_t TextureBaseAddr[GAMMA_TEX_MAXLEVELS];
-   int32_t TextureAddressMode;
-   int32_t TextureColorMode;
-   int32_t TextureFilterMode;
-   int32_t TextureFormat;
-   int32_t TextureReadMode;
-   int32_t TextureBorderColor;
+   u_int32_t TextureBaseAddr[GAMMA_TEX_MAXLEVELS];
+   u_int32_t TextureAddressMode;
+   u_int32_t TextureColorMode;
+   u_int32_t TextureFilterMode;
+   u_int32_t TextureFormat;
+   u_int32_t TextureReadMode;
+   u_int32_t TextureBorderColor;
 };             
 
 #define GAMMA_NO_PALETTE        0x0
@@ -243,7 +243,7 @@ struct gamma_context {
 
        /* Mirrors of some DRI state
         */
-       drmContext hHWContext;
+       drm_context_t hHWContext;
        drm_hw_lock_t *driHwLock;
        int driFd;
 
@@ -300,18 +300,18 @@ struct gamma_context {
        unsigned int lastStamp;
    
 
-       int32_t                         ClearColor;
-       int32_t                 Color;
-       int32_t                 DitherMode;
-       int32_t                 ClearDepth;
-       int32_t                 FogMode;
-       int32_t                 AreaStippleMode;
-       int32_t                 LBReadFormat;
-       int32_t                 LBWriteFormat;
-       int32_t                 LineMode;
-       int32_t                 PointMode;
-       int32_t                 TriangleMode;
-       int32_t                 AntialiasMode;
+       u_int32_t               ClearColor;
+       u_int32_t               Color;
+       u_int32_t               DitherMode;
+       u_int32_t               ClearDepth;
+       u_int32_t               FogMode;
+       u_int32_t               AreaStippleMode;
+       u_int32_t               LBReadFormat;
+       u_int32_t               LBWriteFormat;
+       u_int32_t               LineMode;
+       u_int32_t               PointMode;
+       u_int32_t               TriangleMode;
+       u_int32_t               AntialiasMode;
        GLfloat                 ViewportScaleX;
        GLfloat                 ViewportScaleY;
        GLfloat                 ViewportScaleZ;