diff options
author | marha <marha@users.sourceforge.net> | 2010-04-22 08:57:22 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2010-04-22 08:57:22 +0000 |
commit | d2bf55b405ea8f980984aab4be7d4b878c9e6981 (patch) | |
tree | 676ad441e287f6de1950260c3d2ef0b720f69bad /xorg-server/hw/xfree86/xaa/xaaInit.c | |
parent | a46e26df6103fb0e6e00d8d11d58c3f7a358208c (diff) | |
download | vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.tar.gz vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.tar.bz2 vcxsrv-d2bf55b405ea8f980984aab4be7d4b878c9e6981.zip |
git update 22/4/2010
Diffstat (limited to 'xorg-server/hw/xfree86/xaa/xaaInit.c')
-rw-r--r-- | xorg-server/hw/xfree86/xaa/xaaInit.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/xorg-server/hw/xfree86/xaa/xaaInit.c b/xorg-server/hw/xfree86/xaa/xaaInit.c index 2ce2d9085..7d4583dc2 100644 --- a/xorg-server/hw/xfree86/xaa/xaaInit.c +++ b/xorg-server/hw/xfree86/xaa/xaaInit.c @@ -100,9 +100,7 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec) ScrnInfoPtr pScrn = xf86Screens[pScreen->myNum]; XAAScreenPtr pScreenPriv; int i; -#ifdef RENDER PictureScreenPtr ps = GetPictureScreenIfSet(pScreen); -#endif /* Return successfully if no acceleration wanted */ if (!infoRec) @@ -173,7 +171,6 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec) pScrn->EnableDisableFBAccess = XAAEnableDisableFBAccess; pScreenPriv->WindowExposures = pScreen->WindowExposures; -#ifdef RENDER if (ps) { pScreenPriv->Composite = ps->Composite; @@ -181,7 +178,6 @@ XAAInit(ScreenPtr pScreen, XAAInfoRecPtr infoRec) pScreenPriv->Glyphs = ps->Glyphs; ps->Glyphs = XAAGlyphs; } -#endif if(pScrn->overlayFlags & OVERLAY_8_32_PLANAR) XAASetupOverlay8_32Planar(pScreen); |