ajax removed the key parts of that patch two years ago in commit dc2a372ad7edf34417d7d7042562b601e4f0041c. This patch reverts the rest of commit 57cea11892e956f4e6f07005e05d121fa48c3059, aside from whitespace changes. --- This is the only user of xaaWrapper. Can we just kill it?
src/neo.h | 2 -- src/neo_2070.c | 2 +- src/neo_2097.c | 2 +- src/neo_2200.c | 2 +- src/neo_driver.c | 18 +++--------------- 5 files changed, 6 insertions(+), 20 deletions(-) diff --git a/src/neo.h b/src/neo.h index 718b8a5..f3f2b4c 100644 --- a/src/neo.h +++ b/src/neo.h @@ -48,7 +48,6 @@ CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. #include "xaa.h" #include "xaalocal.h" /* XAA internals as we replace some of XAA */ -#include "xaaWrapper.h" #include "xf86Cursor.h" #include "shadowfb.h" @@ -268,7 +267,6 @@ typedef struct neoRec int overlay_offset; int videoKey; int interlace; - SyncFunc accelSync; } NEORec, *NEOPtr; typedef struct { diff --git a/src/neo_2070.c b/src/neo_2070.c index 007a304..b3811d6 100644 --- a/src/neo_2070.c +++ b/src/neo_2070.c @@ -159,7 +159,7 @@ Neo2070AccelInit(ScreenPtr pScreen) return FALSE; } - return (xaaSetupWrapper(pScreen, infoPtr, pScrn->depth, &nPtr->accelSync)); + return(XAAInit(pScreen, infoPtr)); } diff --git a/src/neo_2097.c b/src/neo_2097.c index ed9014c..7d720df 100644 --- a/src/neo_2097.c +++ b/src/neo_2097.c @@ -248,7 +248,7 @@ Neo2097AccelInit(ScreenPtr pScreen) return FALSE; } - return (xaaSetupWrapper(pScreen, infoPtr, pScrn->depth, &nPtr->accelSync)); + return(XAAInit(pScreen, infoPtr)); } static void diff --git a/src/neo_2200.c b/src/neo_2200.c index 78b3367..4b354e7 100644 --- a/src/neo_2200.c +++ b/src/neo_2200.c @@ -253,7 +253,7 @@ Neo2200AccelInit(ScreenPtr pScreen) return FALSE; } - return (xaaSetupWrapper(pScreen, infoPtr, pScrn->depth, &nPtr->accelSync)); + return(XAAInit(pScreen, infoPtr)); } static void diff --git a/src/neo_driver.c b/src/neo_driver.c index 9b40943..b12c125 100644 --- a/src/neo_driver.c +++ b/src/neo_driver.c @@ -1454,22 +1454,11 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) miClearVisualTypes(); /* Setup the visuals we support. */ -#if 0 - if (!miSetVisualTypes(pScrn->depth, - miGetDefaultVisualMask(pScrn->depth), - pScrn->rgbBits, pScrn->defaultVisual)) - return FALSE; -#else if (!miSetVisualTypes(pScrn->depth, miGetDefaultVisualMask(pScrn->depth), pScrn->rgbBits, pScrn->defaultVisual)) return FALSE; - if (pScrn->depth > 8) { - if (!miSetVisualTypes(8, miGetDefaultVisualMask(8), 6, - pScrn->defaultVisual)) - return FALSE; - } -#endif + if (!miSetPixmapDepths ()) return FALSE; /* @@ -1505,8 +1494,7 @@ NEOScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) /* Fixup RGB ordering */ visual = pScreen->visuals + pScreen->numVisuals; while (--visual >= pScreen->visuals) { - if ((visual->class | DynamicClass) == DirectColor - && visual->nplanes > 8) { + if ((visual->class | DynamicClass) == DirectColor) { visual->offsetRed = pScrn->offset.red; visual->offsetGreen = pScrn->offset.green; visual->offsetBlue = pScrn->offset.blue; @@ -2605,7 +2593,7 @@ neoModeInit(ScrnInfoPtr pScrn, DisplayModePtr mode) */ NeoStd->Attribute[16] = 0x01; - switch (pScrn->depth) { /*...@!@*/ + switch (pScrn->depth) { case 8 : NeoStd->CRTC[0x13] = pScrn->displayWidth >> 3; NeoNew->ExtCRTOffset = pScrn->displayWidth >> 11; -- 1.7.0 _______________________________________________ xorg-devel@lists.x.org: X.Org development Archives: http://lists.x.org/archives/xorg-devel Info: http://lists.x.org/mailman/listinfo/xorg-devel