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 4d9d92fdb66cbea555bb457cc99b26f29800d343..026ff5efbff8e10d17612d0e73073da8fb5e538d 100644 (file)
--- a/src/mesa/drivers/dri/gamma/gamma_state.c
+++ b/src/mesa/drivers/dri/gamma/gamma_state.c
@@ -230,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
@@ -349,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; }
 
@@ -1099,8 +1099,6 @@ void gammaUpdateWindow( GLcontext *ctx )
 static void gammaDDViewport( GLcontext *ctx, GLint x, GLint y,
                            GLsizei width, GLsizei height )
 {
-   /* update size of Mesa/software ancillary buffers */
-   _mesa_ResizeBuffersMESA();
    gammaUpdateWindow( ctx );
 }
 
@@ -1593,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);
@@ -1723,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;
 }