- Fix the exa pixmap offset/pitch alignment to deal with non-POT alignment

    requirements. MGA, notably, uses a multiple of 3 in some cases.
- Rename the pixmap offset/pitch alignment fields to more clearly state
    their meaning.

1 files changed, 3 insertions, 3 deletions

diff --git a/exa/exa.c b/exa/exa.c
index f7574586d..5ba8af356 100644
--- a/exa/exa.c
+++ b/exa/exa.c
@@ -162,13 +162,13 @@ exaPixmapAllocArea (PixmapPtr pPixmap)
 
     if (pExaScr->info->card.flags & EXA_OFFSCREEN_ALIGN_POT && w != 1)
 	w = 1 << (exaLog2(w - 1) + 1);
-    pitch = (w * bpp / 8 + pExaScr->info->card.offscreenPitch - 1) &
-            ~(pExaScr->info->card.offscreenPitch - 1);
+    pitch = (w * bpp / 8) + (pExaScr->info->card.pixmapPitchAlign - 1);
+    pitch -= pitch % pExaScr->info->card.pixmapPitchAlign;
 
     pExaPixmap->devKind = pPixmap->devKind;
     pExaPixmap->devPrivate = pPixmap->devPrivate;
     pExaPixmap->area = exaOffscreenAlloc (pScreen, pitch * h,
-                                          pExaScr->info->card.offscreenByteAlign,
+                                          pExaScr->info->card.pixmapOffsetAlign,
                                           FALSE,
                                           exaPixmapSave, (pointer) pPixmap);
     if (!pExaPixmap->area)