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

[mesa.git] / src / mesa / drivers / dri / s3v / s3v_state.c

diff --git a/src/mesa/drivers/dri/s3v/s3v_state.c b/src/mesa/drivers/dri/s3v/s3v_state.c
index 66f15dbbbdae977356afed8e08ce8ff955fd0ac7..e692f20e8a93182dfb6919f0105b3d119ced2cde 100644 (file)
--- a/src/mesa/drivers/dri/s3v/s3v_state.c
+++ b/src/mesa/drivers/dri/s3v/s3v_state.c
@@ -51,7 +51,7 @@ static void s3vUpdateAlphaMode( GLcontext *ctx )
        
 }
 
-static void s3vDDAlphaFunc( GLcontext *ctx, GLenum func, GLchan ref )
+static void s3vDDAlphaFunc( GLcontext *ctx, GLenum func, GLfloat ref )
 {
    s3vContextPtr vmesa = S3V_CONTEXT(ctx);
 
@@ -117,8 +117,8 @@ static void s3vDDClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
                DMAOUT(vmesa->DestXY);
        DMAFINISH();
 
-       if (mask & DD_DEPTH_BIT) { /* depth */
-               DEBUG(("DD_DEPTH_BIT\n"));
+       if (mask & BUFFER_BIT_DEPTH) { /* depth */
+               DEBUG(("BUFFER_BIT_DEPTH\n"));
                
                _stride = ((cw+31)&~31) * 2;
 
@@ -142,7 +142,7 @@ static void s3vDDClear( GLcontext *ctx, GLbitfield mask, GLboolean all,
                DMAFINISH();            
 
                DEBUG(("vmesa->ClearDepth = 0x%x\n", vmesa->ClearDepth));
-               mask &= ~DD_DEPTH_BIT;
+               mask &= ~BUFFER_BIT_DEPTH;
        }
 
        if (!vmesa->NotClipped) {
@@ -492,7 +492,7 @@ static void s3vDDColorMask( GLcontext *ctx, GLboolean r, GLboolean g,
  * Miscellaneous
  */
 
-static void s3vDDClearColor( GLcontext *ctx, const GLchan color[4])
+static void s3vDDClearColor( GLcontext *ctx, const GLfloat color[4])
 {
    s3vContextPtr vmesa = S3V_CONTEXT(ctx);
 
@@ -842,14 +842,17 @@ void s3vInitStateFuncs( GLcontext *ctx )
    ctx->Driver.Clear                   = s3vDDClear;
    ctx->Driver.ClearIndex              = NULL;
    ctx->Driver.ClearColor              = s3vDDClearColor;
-   ctx->Driver.SetDrawBuffer           = s3vDDSetDrawBuffer; 
+   ctx->Driver.DrawBuffer              = s3vDDSetDrawBuffer; 
+   ctx->Driver.ReadBuffer               = NULL; /* XXX */
 
    ctx->Driver.IndexMask               = NULL;
    ctx->Driver.ColorMask               = NULL; /* s3vDDColorMask; */ /* FIXME */
 
    ctx->Driver.AlphaFunc               = s3vDDAlphaFunc; /* FIXME */
+#if 0
    ctx->Driver.BlendEquation           = NULL; /* s3vDDBlendEquation; */
    ctx->Driver.BlendFunc               = s3vDDBlendFunc; /* FIXME */
+#endif
    ctx->Driver.BlendFuncSeparate       = NULL; /* s3vDDBlendFuncSeparate; */
    ctx->Driver.ClearDepth              = s3vDDClearDepth;
    ctx->Driver.CullFace                        = s3vDDCullFace; 
@@ -877,9 +880,5 @@ void s3vInitStateFuncs( GLcontext *ctx )
    ctx->Driver.PolygonStipple          = NULL; /* s3vDDPolygonStipple; */
    ctx->Driver.Scissor                 = s3vDDScissor; /* ScissorLR / ScissorTB */
    ctx->Driver.ShadeModel              = NULL; /* s3vDDShadeModel; */
-   ctx->Driver.ClearStencil            = NULL;
-   ctx->Driver.StencilFunc             = NULL;
-   ctx->Driver.StencilMask             = NULL;
-   ctx->Driver.StencilOp               = NULL;
    ctx->Driver.Viewport                        = NULL; /* s3vDDViewport; */
 }