From d2bf55b405ea8f980984aab4be7d4b878c9e6981 Mon Sep 17 00:00:00 2001 From: marha Date: Thu, 22 Apr 2010 08:57:22 +0000 Subject: git update 22/4/2010 --- xorg-server/hw/xfree86/common/xf86Init.c | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'xorg-server/hw/xfree86/common/xf86Init.c') diff --git a/xorg-server/hw/xfree86/common/xf86Init.c b/xorg-server/hw/xfree86/common/xf86Init.c index 71ac9a9fe..03a29ea0f 100644 --- a/xorg-server/hw/xfree86/common/xf86Init.c +++ b/xorg-server/hw/xfree86/common/xf86Init.c @@ -74,9 +74,7 @@ #include "xf86DDC.h" #include "xf86Xinput.h" #include "xf86InPriv.h" -#ifdef RENDER #include "picturestr.h" -#endif #include "xf86VGAarbiter.h" #include "globals.h" @@ -110,15 +108,9 @@ static PixmapFormatRec formats[MAXFORMATS] = { { 15, 16, BITMAP_SCANLINE_PAD }, { 16, 16, BITMAP_SCANLINE_PAD }, { 24, 32, BITMAP_SCANLINE_PAD }, -#ifdef RENDER { 32, 32, BITMAP_SCANLINE_PAD }, -#endif }; -#ifdef RENDER static int numFormats = 7; -#else -static int numFormats = 6; -#endif static Bool formatsDone = FALSE; #ifndef OSNAME @@ -1082,7 +1074,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) xf86Screens[i]->pScreen->CreateWindow); xf86Screens[i]->pScreen->CreateWindow = xf86CreateRootWindow; -#ifdef RENDER if (PictureGetSubpixelOrder (xf86Screens[i]->pScreen) == SubPixelUnknown) { xf86MonPtr DDC = (xf86MonPtr)(xf86Screens[i]->monitor->DDC); @@ -1092,7 +1083,6 @@ InitOutput(ScreenInfo *pScreenInfo, int argc, char **argv) SubPixelHorizontalRGB : SubPixelNone) : SubPixelUnknown); } -#endif #ifdef RANDR if (!xf86Info.disableRandR) xf86RandRInit (screenInfo.screens[scr_index]); -- cgit v1.2.3