diff options
| author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2010-04-26 11:40:57 -0500 |
|---|---|---|
| committer | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2010-04-26 11:40:57 -0500 |
| commit | be4b761f78e8c767915c15bbed3be23f0aec4db3 (patch) | |
| tree | 96988d438d57dc98318bf2aa637897370ec43e97 /hw/xfree86/common/xf86Init.c | |
| parent | 4ae527cec2cd01a973351a8dec9816413522c963 (diff) | |
| parent | b557571dbff3d9a615e03cad904d46b8af9153a0 (diff) | |
Merge remote branch 'origin/master' into cygwincygwin
Diffstat (limited to 'hw/xfree86/common/xf86Init.c')
| -rw-r--r-- | hw/xfree86/common/xf86Init.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c index 71ac9a9fe..03a29ea0f 100644 --- a/hw/xfree86/common/xf86Init.c +++ b/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]); |