Merge branch 'mesa_7_7_branch'

[mesa.git] / src / mesa / drivers / dri / savage / savageioctl.c

diff --git a/src/mesa/drivers/dri/savage/savageioctl.c b/src/mesa/drivers/dri/savage/savageioctl.c
index 624d6af5e8e7767bd94ea61ef3f13f7b9a73d95b..9e181ce3be9acbc7cdd72e28a20eddbe43d422f7 100644 (file)
--- a/src/mesa/drivers/dri/savage/savageioctl.c
+++ b/src/mesa/drivers/dri/savage/savageioctl.c
@@ -358,15 +358,15 @@ static void savageDDClear( GLcontext *ctx, GLbitfield mask )
    depthMask = 0;
    switch (imesa->savageScreen->cpp) {
    case 2:
-       colorMask = PACK_COLOR_565(ctx->Color.ColorMask[0],
-                                 ctx->Color.ColorMask[1],
-                                 ctx->Color.ColorMask[2]);
+       colorMask = PACK_COLOR_565(ctx->Color.ColorMask[0][0],
+                                 ctx->Color.ColorMask[0][1],
+                                 ctx->Color.ColorMask[0][2]);
        break;
    case 4:
-       colorMask = PACK_COLOR_8888(ctx->Color.ColorMask[3],
-                                  ctx->Color.ColorMask[2],
-                                  ctx->Color.ColorMask[1],
-                                  ctx->Color.ColorMask[0]);
+       colorMask = PACK_COLOR_8888(ctx->Color.ColorMask[0][3],
+                                  ctx->Color.ColorMask[0][2],
+                                  ctx->Color.ColorMask[0][1],
+                                  ctx->Color.ColorMask[0][0]);
        break;
    }
 
@@ -431,7 +431,7 @@ static void savageDDClear( GLcontext *ctx, GLbitfield mask )
 /*
  * Copy the back buffer to the front buffer. 
  */
-void savageSwapBuffers( __DRIdrawablePrivate *dPriv )
+void savageSwapBuffers( __DRIdrawable *dPriv )
 {
    savageContextPtr imesa;
 
@@ -535,7 +535,7 @@ void savageFlushVertices( savageContextPtr imesa )
 
 void savageFlushCmdBufLocked( savageContextPtr imesa, GLboolean discard )
 {
-    __DRIdrawablePrivate *dPriv = imesa->driDrawable;
+    __DRIdrawable *dPriv = imesa->driDrawable;
 
     if (!imesa->dmaVtxBuf.total)
        discard = GL_FALSE;