fix up radeon span functions using latest r200 code from Brian,

[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 4572a0224d2fefb97ef779a4988c06a40dcb2974..7745f4c3c3df438fe83a926ee115087cb2c4058c 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_context.h
+++ b/src/mesa/drivers/dri/gamma/gamma_context.h
@@ -118,7 +118,7 @@ typedef struct gamma_texture_object_t *gammaTextureObjectPtr;
 
 #define VALID_GAMMA_TEXTURE_OBJECT(tobj)  (tobj) 
 
-#define GAMMA_TEX_MAXLEVELS 12
+#define GAMMA_TEX_MAXLEVELS 12  /* 2K x 2K */
 
 /* For shared texture space managment, these texture objects may also
  * be used as proxies for regions of texture memory containing other
@@ -160,13 +160,13 @@ struct gamma_texture_object_t {
       int internalFormat;
    } image[GAMMA_TEX_MAXLEVELS];
 
-   uint32_t TextureBaseAddr[GAMMA_TEX_MAXLEVELS];
-   uint32_t TextureAddressMode;
-   uint32_t TextureColorMode;
-   uint32_t TextureFilterMode;
-   uint32_t TextureFormat;
-   uint32_t TextureReadMode;
-   uint32_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
@@ -300,18 +300,18 @@ struct gamma_context {
        unsigned int lastStamp;
    
 
-       uint32_t                ClearColor;
-       uint32_t                Color;
-       uint32_t                DitherMode;
-       uint32_t                ClearDepth;
-       uint32_t                FogMode;
-       uint32_t                AreaStippleMode;
-       uint32_t                LBReadFormat;
-       uint32_t                LBWriteFormat;
-       uint32_t                LineMode;
-       uint32_t                PointMode;
-       uint32_t                TriangleMode;
-       uint32_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;