XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folksxf86-4_3_99_16

1 files changed, 11 insertions, 7 deletions

diff --git a/src/atiscreen.c b/src/atiscreen.c
index 59b04e09..daf5a8ce 100644
--- a/src/atiscreen.c
+++ b/src/atiscreen.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c,v 1.29 2003/01/01 19:16:34 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/ati/atiscreen.c,v 1.30 2003/04/23 21:51:30 tsi Exp $ */
 /*
  * Copyright 1999 through 2003 by Marc Aurele La France (TSI @ UQV), tsi@xfree86.org
  *
@@ -63,10 +63,9 @@ ATIRefreshArea
 
     while (nBox-- > 0)
     {
-        w = (pBox->x2 - pBox->x1) * pATI->FBBytesPerPixel;
+        w = (pBox->x2 - pBox->x1) * pATI->AdjustDepth;
         h = pBox->y2 - pBox->y1;
-        offset =
-            (pBox->y1 * pATI->FBPitch) + (pBox->x1 * pATI->FBBytesPerPixel);
+        offset = (pBox->y1 * pATI->FBPitch) + (pBox->x1 * pATI->AdjustDepth);
         pSrc = (char *)pATI->pShadow + offset;
         pDst = (char *)pATI->pMemory + offset;
 
@@ -120,12 +119,13 @@ ATIScreenInit
         return FALSE;
 
     pFB = pATI->pMemory;
+    pATI->FBPitch = PixmapBytePad(pATI->displayWidth, pATI->depth);
     if (pATI->OptionShadowFB)
     {
-        pATI->FBBytesPerPixel = pATI->bitsPerPixel >> 3;
-        pATI->FBPitch = PixmapBytePad(pATI->displayWidth, pATI->depth);
         if ((pATI->pShadow = xalloc(pATI->FBPitch * pScreenInfo->virtualY)))
+        {
             pFB = pATI->pShadow;
+        }
         else
         {
             xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
@@ -216,8 +216,10 @@ ATIScreenInit
 
         else if (!fbPictureInit(pScreen, NULL, 0) &&
                  (serverGeneration == 1))
+        {
             xf86DrvMsg(pScreenInfo->scrnIndex, X_WARNING,
                 "RENDER extension initialisation failed.\n");
+        }
     }
 
     xf86SetBlackWhitePixels(pScreen);
@@ -239,7 +241,7 @@ ATIScreenInit
 #ifndef AVOID_DGA
 
     /* Initialise DGA support */
-    (void)ATIDGAInit(pScreenInfo, pScreen, pATI);
+    (void)ATIDGAInit(pScreen, pScreenInfo, pATI);
 
 #endif /* AVOID_DGA */
 
@@ -311,6 +313,8 @@ ATICloseScreen
     ATIPtr      pATI        = ATIPTR(pScreenInfo);
     Bool        Closed      = TRUE;
 
+    ATICloseXVideo(pScreen, pScreenInfo, pATI);
+
     if (pATI->pXAAInfo)
     {
         XAADestroyInfoRec(pATI->pXAAInfo);