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 6c9cf7d35f0aeedfbf20b4ee57527e018b6c357b..7745f4c3c3df438fe83a926ee115087cb2c4058c 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_context.h
+++ b/src/mesa/drivers/dri/gamma/gamma_context.h
@@ -28,6 +28,8 @@
 #define _GAMMA_CONTEXT_H_
 
 #include "dri_util.h"
+#include "drm.h"
+#include "drm_sarea.h"
 #include "colormac.h"
 #include "gamma_regs.h"
 #include "gamma_macros.h"
@@ -116,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
@@ -158,13 +160,13 @@ struct gamma_texture_object_t {
       int internalFormat;
    } image[GAMMA_TEX_MAXLEVELS];
 
-   CARD32 TextureBaseAddr[GAMMA_TEX_MAXLEVELS];
-   CARD32 TextureAddressMode;
-   CARD32 TextureColorMode;
-   CARD32 TextureFilterMode;
-   CARD32 TextureFormat;
-   CARD32 TextureReadMode;
-   CARD32 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
@@ -241,7 +243,7 @@ struct gamma_context {
 
        /* Mirrors of some DRI state
         */
-       drmContext hHWContext;
+       drm_context_t hHWContext;
        drm_hw_lock_t *driHwLock;
        int driFd;
 
@@ -298,18 +300,18 @@ struct gamma_context {
        unsigned int lastStamp;
    
 
-       CARD32                  ClearColor;
-       CARD32                  Color;
-       CARD32                  DitherMode;
-       CARD32                  ClearDepth;
-       CARD32                  FogMode;
-       CARD32                  AreaStippleMode;
-       CARD32                  LBReadFormat;
-       CARD32                  LBWriteFormat;
-       CARD32                  LineMode;
-       CARD32                  PointMode;
-       CARD32                  TriangleMode;
-       CARD32                  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;