diff options
| author | Dave Airlie <airlied@redhat.com> | 2010-12-02 19:11:05 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2010-12-02 19:11:05 +1000 |
| commit | d60087f0b6dd4d082230312580ae35e14acd0c6e (patch) | |
| tree | 2b3c2eb58d15204ef11fefb8cd734af1079bfc0f | |
| parent | e7bc106247d9ba10a922936e137a4f5ecc54ef9e (diff) | |
mach64: fix the pixmap private API change.
| -rw-r--r-- | src/aticonsole.c | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/aticonsole.c b/src/aticonsole.c index 1be147e..6e742d9 100644 --- a/src/aticonsole.c +++ b/src/aticonsole.c @@ -28,6 +28,7 @@ #include "config.h" #endif +#include "xorgVersion.h" #include "ati.h" #include "aticonsole.h" #include "atii2c.h" @@ -689,7 +690,9 @@ ATIEnterVT ScreenPtr pScreen = pScreenInfo->pScreen; ATIPtr pATI = ATIPTR(pScreenInfo); PixmapPtr pScreenPixmap; +#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) DevUnion PixmapPrivate; +#endif Bool Entered; if (!ATIEnterGraphics(NULL, pScreenInfo, pATI)) @@ -714,19 +717,24 @@ ATIEnterVT } pScreenPixmap = (*pScreen->GetScreenPixmap)(pScreen); + +#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) PixmapPrivate = pScreenPixmap->devPrivate; if (!PixmapPrivate.ptr) pScreenPixmap->devPrivate = pScreenInfo->pixmapPrivate; +#endif /* Tell framebuffer about remapped aperture */ Entered = (*pScreen->ModifyPixmapHeader)(pScreenPixmap, -1, -1, -1, -1, -1, pATI->pMemory); +#if (XORG_VERSION_CURRENT < XORG_VERSION_NUMERIC(1, 9, 99, 1, 0)) if (!PixmapPrivate.ptr) { pScreenInfo->pixmapPrivate = pScreenPixmap->devPrivate; pScreenPixmap->devPrivate.ptr = NULL; } +#endif #ifdef XF86DRI_DEVEL |