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

[mesa.git] / src / mesa / drivers / dri / gamma / gamma_state.c

diff --git a/src/mesa/drivers/dri/gamma/gamma_state.c b/src/mesa/drivers/dri/gamma/gamma_state.c
index 813ced474b361f77ed03106eb7b5243d4ebaf311..026ff5efbff8e10d17612d0e73073da8fb5e538d 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_state.c
+++ b/src/mesa/drivers/dri/gamma/gamma_state.c
@@ -27,6 +27,7 @@
 
 #include "gamma_context.h"
 #include "gamma_macros.h"
+#include "buffers.h"
 #include "macros.h"
 #include "glint_dri.h"
 #include "colormac.h"
@@ -44,9 +45,9 @@
 static void gammaUpdateAlphaMode( GLcontext *ctx )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
-   CARD32 a = gmesa->AlphaTestMode;
-   CARD32 b = gmesa->AlphaBlendMode;
-   CARD32 f = gmesa->AB_FBReadMode_Save = 0;
+   u_int32_t a = gmesa->AlphaTestMode;
+   u_int32_t b = gmesa->AlphaBlendMode;
+   u_int32_t f = gmesa->AB_FBReadMode_Save = 0;
    GLubyte refByte = (GLint) (ctx->Color.AlphaRef * 255.0);
 
    a &= ~(AT_CompareMask | AT_RefValueMask);
@@ -229,12 +230,12 @@ static void gammaDDClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
     VALIDATE_DRAWABLE_INFO_NO_LOCK(gmesa);
 #endif
 
-    if (mask & DD_DEPTH_BIT) {
+    if (mask & BUFFER_BIT_DEPTH) {
         /* Turn off writes the FB */
         CHECK_DMA_BUFFER(gmesa, 1);
         WRITE(gmesa->buf, FBWriteMode, FBWriteModeDisable);
 
-        mask &= ~DD_DEPTH_BIT;
+        mask &= ~BUFFER_BIT_DEPTH;
 
         /*
          * Turn Rectangle2DControl off when the window is not clipped
@@ -348,13 +349,13 @@ static void gammaDDClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
        }
     }
 
-    if (mask & (DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT)) {
+    if (mask & (BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_BACK_LEFT)) {
        int y = gmesa->driScreen->fbHeight - gmesa->driDrawable->y - gmesa->driDrawable->h;
        int x = gmesa->driDrawable->x;
        int w = gmesa->driDrawable->w;
        int h = gmesa->driDrawable->h;
 
-       mask &= ~(DD_FRONT_LEFT_BIT | DD_BACK_LEFT_BIT);
+       mask &= ~(BUFFER_BIT_FRONT_LEFT | BUFFER_BIT_BACK_LEFT);
 
        if (x < 0) { w -= -x; x = 0; }
 
@@ -419,10 +420,10 @@ static void gammaDDClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
 static void gammaUpdateZMode( GLcontext *ctx )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
-   CARD32 z = gmesa->DepthMode;
-   CARD32 delta = gmesa->DeltaMode;
-   CARD32 window = gmesa->Window;
-   CARD32 lbread = gmesa->LBReadMode;
+   u_int32_t z = gmesa->DepthMode;
+   u_int32_t delta = gmesa->DeltaMode;
+   u_int32_t window = gmesa->Window;
+   u_int32_t lbread = gmesa->LBReadMode;
 
    z &= ~DM_CompareMask;
 
@@ -538,9 +539,9 @@ static void gammaDDFlush( GLcontext *ctx )
 static void gammaUpdateFogAttrib( GLcontext *ctx )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
-   CARD32 f = gmesa->FogMode;
-   CARD32 g = gmesa->GeometryMode;
-   CARD32 d = gmesa->DeltaMode;
+   u_int32_t f = gmesa->FogMode;
+   u_int32_t g = gmesa->GeometryMode;
+   u_int32_t d = gmesa->DeltaMode;
 
    if (ctx->Fog.Enabled) {
       f |= FogModeEnable;
@@ -582,6 +583,7 @@ static void gammaUpdateFogAttrib( GLcontext *ctx )
    }
 }
 
+#if 0
 static void gammaDDFogfv( GLcontext *ctx, GLenum pname, const GLfloat *param )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
@@ -589,6 +591,7 @@ static void gammaDDFogfv( GLcontext *ctx, GLenum pname, const GLfloat *param )
    FLUSH_BATCH( gmesa );
    gmesa->new_state |= GAMMA_NEW_FOG;
 }
+#endif
 
 /* =============================================================
  * Lines
@@ -634,7 +637,7 @@ static void gammaDDPointSize( GLcontext *ctx, GLfloat size )
 static void gammaUpdatePolygon( GLcontext *ctx )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
-   CARD32 g = gmesa->GeometryMode;
+   u_int32_t g = gmesa->GeometryMode;
 
    g &= ~(GM_PolyOffsetFillEnable | GM_PolyOffsetPointEnable |
           GM_PolyOffsetLineEnable);
@@ -752,7 +755,7 @@ static void gammaDDScissor( GLcontext *ctx,
 static void gammaUpdateCull( GLcontext *ctx )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
-   CARD32 g = gmesa->GeometryMode;
+   u_int32_t g = gmesa->GeometryMode;
 
    g &= ~(GM_PolyCullMask | GM_FFMask);
 
@@ -972,8 +975,8 @@ static void gammaDDLightModelfv( GLcontext *ctx, GLenum pname,
 static void gammaDDShadeModel( GLcontext *ctx, GLenum mode )
 {
    gammaContextPtr gmesa = GAMMA_CONTEXT(ctx);
-   CARD32 g = gmesa->GeometryMode;
-   CARD32 c = gmesa->ColorDDAMode;
+   u_int32_t g = gmesa->GeometryMode;
+   u_int32_t c = gmesa->ColorDDAMode;
 
    g &= ~GM_ShadingMask;
    c &= ~ColorDDAShadingMask;
@@ -1240,7 +1243,7 @@ static void gammaDDEnable( GLcontext *ctx, GLenum cap, GLboolean state )
 
    case GL_DITHER:
       do {
-        CARD32 d = gmesa->DitherMode;
+        u_int32_t d = gmesa->DitherMode;
         FLUSH_BATCH( gmesa );
 
         if ( state ) {
@@ -1272,7 +1275,7 @@ static void gammaDDEnable( GLcontext *ctx, GLenum cap, GLboolean state )
 #if ENABLELIGHTING
    case GL_LIGHTING:
       do {
-        CARD32 l = gmesa->LightingMode;
+        u_int32_t l = gmesa->LightingMode;
         FLUSH_BATCH( gmesa );
 
         if ( state ) {
@@ -1290,7 +1293,7 @@ static void gammaDDEnable( GLcontext *ctx, GLenum cap, GLboolean state )
 
    case GL_COLOR_MATERIAL:
       do {
-        CARD32 m = gmesa->MaterialMode;
+        u_int32_t m = gmesa->MaterialMode;
         FLUSH_BATCH( gmesa );
 
         if ( state ) {
@@ -1588,7 +1591,6 @@ void gammaEmitHwState( gammaContextPtr gmesa )
        WRITE(gmesa->buf, TxBaseAddr9, curTex->TextureBaseAddr[9]);
        WRITE(gmesa->buf, TxBaseAddr10, curTex->TextureBaseAddr[10]);
        WRITE(gmesa->buf, TxBaseAddr11, curTex->TextureBaseAddr[11]);
-       WRITE(gmesa->buf, TxBaseAddr12, curTex->TextureBaseAddr[12]);
        WRITE(gmesa->buf, TextureCacheControl, (TCC_Enable | TCC_Invalidate));
        } else {
        CHECK_DMA_BUFFER(gmesa, 6);
@@ -1718,9 +1720,5 @@ void gammaDDInitStateFuncs( GLcontext *ctx )
    ctx->Driver.PolygonStipple          = gammaDDPolygonStipple;
    ctx->Driver.Scissor                 = gammaDDScissor;
    ctx->Driver.ShadeModel              = gammaDDShadeModel;
-   ctx->Driver.ClearStencil            = NULL;
-   ctx->Driver.StencilFunc             = NULL;
-   ctx->Driver.StencilMask             = NULL;
-   ctx->Driver.StencilOp               = NULL;
    ctx->Driver.Viewport                        = gammaDDViewport;
 }