config/cf/X11.tmpl | 43 -- lib/font/fontfile/ffcheck.c | 2 lib/font/fontfile/register.c | 2 programs/Xserver/Imakefile | 25 - programs/Xserver/cfb/cfbgc.c | 8 programs/Xserver/cfb/cfbimage.c | 4 programs/Xserver/cfb/cfbpush8.c | 4 programs/Xserver/hw/sun/Imakefile | 5 programs/Xserver/hw/sun/sunCfb.c | 6 programs/Xserver/hw/sun/sunCursor.c | 5 programs/Xserver/hw/sun/sunInit.c | 3 programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c | 8 programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c | 8 programs/Xserver/lmfcfb/Imakefile | 298 -------------- programs/Xserver/mfb/Imakefile | 4 programs/Xserver/mfb/maskbits.c | 4 programs/Xserver/mfb/mfbbitblt.c | 4 programs/Xserver/mfb/mfbgc.c | 431 --------------------- programs/Xserver/mfb/mfbimggblt.c | 4 programs/Xserver/mfb/mfbpixmap.c | 2 programs/Xserver/mfb/mfbscrinit.c | 4 programs/xfs/difs/Imakefile | 7 programs/xfs/difs/initfonts.c | 8 23 files changed, 3 insertions(+), 886 deletions(-) Index: config/cf/X11.tmpl =================================================================== RCS file: /cvs/xorg/xc/config/cf/X11.tmpl,v retrieving revision 1.44 diff -u -d -r1.44 X11.tmpl --- config/cf/X11.tmpl 23 Mar 2005 21:54:49 -0000 1.44 +++ config/cf/X11.tmpl 19 Apr 2005 22:49:43 -0000 @@ -407,9 +407,6 @@ #ifndef FontencCompatibility #define FontencCompatibility YES #endif -#ifndef BuildLowMem -#define BuildLowMem NO -#endif #ifndef BuildLBX #define BuildLBX YES #endif @@ -798,36 +795,6 @@ #ifndef PrimaryScreenResolution #define PrimaryScreenResolution 72 /* a common resolution */ #endif -#ifndef DefaultFontPath - /* - * Turn off building Type1 and CID fonts if you are building - * for low memory footprint - */ -#if BuildLowMem -#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/ -#else -#if PrimaryScreenResolution < 88 /* (75 + 100) / 2 */ -#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/ -#else -#define DefaultFontPath $(FONTDIR)/misc/,$(FONTDIR)/TTF/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/ -#endif -#endif -#endif -#ifndef DefaultFSFontPath - /* - * Define a default fontpath for Font Server independent of that - * for X server if building the X server for low memory footprint - */ -#if BuildLowMem -#if PrimaryScreenResolution < 88 /* (75 + 100) / 2 */ -#define DefaultFSFontPath $(FONTDIR)/misc/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/75dpi/,$(FONTDIR)/100dpi/ -#else -#define DefaultFSFontPath $(FONTDIR)/misc/,$(FONTDIR)/Type1/,$(FONTDIR)/CID/,$(FONTDIR)/100dpi/,$(FONTDIR)/75dpi/ -#endif -#else -#define DefaultFSFontPath DefaultFontPath -#endif -#endif #ifndef DefaultRGBDatabase #define DefaultRGBDatabase $(LIBDIR)/rgb #endif @@ -1178,14 +1145,6 @@ #endif #endif -#ifndef LowMemDefines -#if BuildLowMem -#define LowMemDefines -DLOWMEMFTPT -#else -#define LowMemDefines /**/ -#endif -#endif - #ifndef DPMSDefines #if BuildDPMS #define DPMSDefines -DDPMSExtension @@ -1266,7 +1225,7 @@ ShapeDefines XInputDefines XkbDefines LbxDefines AppgroupDefines \ XCSecurityDefines CupDefines PervasiveDBEDefines \ XF86BigfontExtensionDefines DPMSDefines \ - LowMemDefines XprintDefines XineramaDefines \ + XprintDefines XineramaDefines \ SitePervasiveExtensionDefines RenderDefines RandRDefines \ XfixesDefines XDamageDefines CompositeDefines XevieDefines \ RootlessDefines Index: lib/font/fontfile/ffcheck.c =================================================================== RCS file: /cvs/xorg/xc/lib/font/fontfile/ffcheck.c,v retrieving revision 1.3 diff -u -d -r1.3 ffcheck.c --- lib/font/fontfile/ffcheck.c 4 May 2004 22:59:15 -0000 1.3 +++ lib/font/fontfile/ffcheck.c 19 Apr 2005 22:49:45 -0000 @@ -121,7 +121,6 @@ #ifndef LOADABLEFONTS BitmapRegisterFontFileFunctions (); -#ifndef LOWMEMFTPT #ifndef CRAY #ifdef BUILD_SPEEDO @@ -138,7 +137,6 @@ FreeTypeRegisterFontFileFunctions(); #endif -#endif /* ifndef LOWMEMFTPT */ #else Index: lib/font/fontfile/register.c =================================================================== RCS file: /cvs/xorg/xc/lib/font/fontfile/register.c,v retrieving revision 1.3 diff -u -d -r1.3 register.c --- lib/font/fontfile/register.c 4 May 2004 22:59:15 -0000 1.3 +++ lib/font/fontfile/register.c 19 Apr 2005 22:49:45 -0000 @@ -47,7 +47,6 @@ #ifndef LOADABLEFONTS BitmapRegisterFontFileFunctions (); -#ifndef LOWMEMFTPT #ifndef CRAY #ifdef BUILD_SPEEDO @@ -64,7 +63,6 @@ FreeTypeRegisterFontFileFunctions(); #endif -#endif /* ifndef LOWMEMFTPT */ #else { Index: programs/Xserver/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/Imakefile,v retrieving revision 1.30 diff -u -d -r1.30 Imakefile --- programs/Xserver/Imakefile 23 Mar 2005 19:58:44 -0000 1.30 +++ programs/Xserver/Imakefile 19 Apr 2005 22:49:45 -0000 @@ -44,9 +44,6 @@ #define NoMFBLibs PreFbLibs NoMfbPostFbLibs #define CFBLibs PreFbLibs $(CFB) PostFbLibs #define CFB4Libs PreFbLibs $(CFB4) PostFbLibs -#if BuildLowMem -#define LMFCFBLibs PreFbLibs $(LMFCFB) NoMfbBarePostFbLibs $(EXTENSIONS) -#endif #define CFB8Libs PreFbLibs $(CFB8) PostFbLibs #define CFB16Libs PreFbLibs $(CFB16) PostFbLibs #define CFB24Libs PreFbLibs $(CFB24) PostFbLibs @@ -274,9 +271,6 @@ SHADOW = miext/shadow/LibraryTargetName(shadow) LAYER = miext/layer/LibraryTargetName(layer) #endif -#if BuildLowMem - LMFCFB = lmfcfb/LibraryTargetName(cfb) -#endif #if !HasFfs && (defined(mingwArchitecture) || defined(cygwinArchitecture)) /* Order of libraries is important when linking in mingw or * cygwin. libmi.a requires ffs from libdix.a. So it is added @@ -354,10 +348,6 @@ * even if multiple servers that share subdirectories are being built. */ -#if BuildLowMem -LMFCFBDIR = lmfcfb -#endif - #if defined(XdecServer) && XdecServer XCOMM XCOMM Digital MIPS based WS server (ultrix 4.2 and beyond) @@ -365,17 +355,9 @@ MFBSUBDIR = mfb CFB8SUBDIR = cfb DECWSDDXDIR = hw/dec/ws -#if BuildLowMem -DECDIRS = $(STDDIRS) $(LMFCFBDIR) $(DECWSDDXDIR) $(DEPDIRS) -#else DECDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(DECWSDDXDIR) $(DEPDIRS) -#endif DECOBJS = hw/dec/ws/init.o hw/dec/ws/sdepthinit.o -#if BuildLowMem -DECLIBS = hw/dec/ws/LibraryTargetName(dec) LMFCFBLibs -#else DECLIBS = hw/dec/ws/LibraryTargetName(dec) CFB8Libs -#endif ServerTarget(Xdec,$(DECDIRS),$(DECOBJS), \ $(DECLIBS),$(FONTLIBS) $(SYSLIBS)) #ifndef ServerToInstall @@ -423,13 +405,8 @@ #else SUNOBJS = hw/sun/sunInit.o #endif -#if BuildLowMem -SUNDIRS = $(STDDIRS) $(LMFCFBDIR) $(SUNDDXDIR) $(DEPDIRS) -SUNLIBS = hw/sun/LibraryTargetName(sun) LMFCFBLibs -#else SUNDIRS = $(STDDIRS) $(MFBDIR) $(CFB8DIR) $(SUNDDXDIR) $(DEPDIRS) SUNLIBS = hw/sun/LibraryTargetName(sun) CFB8Libs -#endif SUNSYSLIBS = $(FONTLIBS) $(WIDECHARSYSLIB) $(SYSLIBS) SetUIDServerTarget(Xsun,$(SUNDIRS),$(SUNOBJS), \ $(LIBCWRAPPER) $(SUNLIBS) $(LOADABLEEXTS),$(SUNSYSLIBS)) @@ -1207,7 +1184,7 @@ $(XVFBDDXDIR) $(XNESTDDXDIR) $(XDMXDDXDIR) SUBDIRS = $(STDDIRS) $(MFBSUBDIR) $(CFBSUBDIRS) \ $(IPLANDIRS) $(ILBMDIR) $(AFBSUBDIR) \ - $(LMFCFBDIR) $(DDXDIRS) $(FBSUBDIR) $(KDRIVEDIRS) $(MIEXTDIRS) + $(DDXDIRS) $(FBSUBDIR) $(KDRIVEDIRS) $(MIEXTDIRS) #if defined(ServerToInstall) && !defined(OS2Architecture) install:: Index: programs/Xserver/cfb/cfbgc.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/cfb/cfbgc.c,v retrieving revision 1.4 diff -u -d -r1.4 cfbgc.c --- programs/Xserver/cfb/cfbgc.c 14 Apr 2005 17:51:51 -0000 1.4 +++ programs/Xserver/cfb/cfbgc.c 19 Apr 2005 22:49:45 -0000 @@ -90,11 +90,7 @@ #ifdef FOUR_BIT_CODE # define usePushPixels cfbPushPixels8 #else -#ifndef LOWMEMFTPT # define usePushPixels cfbUnPushPixels -#else -# define usePushPixels miPushPixels -#endif /* ifndef LOWMEMFTPT */ #endif #ifdef PIXEL_ADDR @@ -776,11 +772,7 @@ } #endif #ifdef FOUR_BIT_CODE -#ifndef LOWMEMFTPT pGC->ops->PushPixels = mfbPushPixelsWeak(); -#else - pGC->ops->PushPixels = miPushPixels; -#endif /* ifndef LOWMEMFTPT */ if (pGC->fillStyle == FillSolid && devPriv->rop == GXcopy) pGC->ops->PushPixels = cfbPushPixels8; #endif Index: programs/Xserver/cfb/cfbimage.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/cfb/cfbimage.c,v retrieving revision 1.2 diff -u -d -r1.2 cfbimage.c --- programs/Xserver/cfb/cfbimage.c 23 Apr 2004 19:00:12 -0000 1.2 +++ programs/Xserver/cfb/cfbimage.c 19 Apr 2005 22:49:45 -0000 @@ -143,11 +143,7 @@ return; if (pDrawable->bitsPerPixel == 1) { -#ifndef LOWMEMFTPT mfbGetImage(pDrawable, sx, sy, w, h, format, planeMask, pdstLine); -#else - miGetImage(pDrawable, sx, sy, w, h, format, planeMask, pdstLine); -#endif /* ifndef LOWMEMFTPT */ return; } pScreen = pDrawable->pScreen; Index: programs/Xserver/cfb/cfbpush8.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/cfb/cfbpush8.c,v retrieving revision 1.2 diff -u -d -r1.2 cfbpush8.c --- programs/Xserver/cfb/cfbpush8.c 23 Apr 2004 19:00:12 -0000 1.2 +++ programs/Xserver/cfb/cfbpush8.c 19 Apr 2005 22:49:45 -0000 @@ -76,11 +76,7 @@ switch (RECT_IN_REGION(pGC->pScreen, pGC->pCompositeClip, &bbox)) { case rgnPART: -#ifndef LOWMEMFTPT mfbPushPixels(pGC, pBitmap, pDrawable, dx, dy, xOrg, yOrg); -#else - miPushPixels(pGC, pBitmap, pDrawable, dx, dy, xOrg, yOrg); -#endif /* ifndef LOWMEMFTPT */ case rgnOUT: return; } Index: programs/Xserver/hw/sun/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/sun/Imakefile,v retrieving revision 1.2 diff -u -d -r1.2 Imakefile --- programs/Xserver/hw/sun/Imakefile 23 Apr 2004 19:18:22 -0000 1.2 +++ programs/Xserver/hw/sun/Imakefile 19 Apr 2005 22:49:45 -0000 @@ -28,13 +28,8 @@ sunMouse.o \ sunKeyMap.o -#if BuildLowMem -SRCS2 = -OBJS2 = -#else SRCS2 = sunGX.c OBJS2 = sunGX.o -#endif #ifdef i386Architecture SRCS3 = sunInit.c Index: programs/Xserver/hw/sun/sunCfb.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/sun/sunCfb.c,v retrieving revision 1.2 diff -u -d -r1.2 sunCfb.c --- programs/Xserver/hw/sun/sunCfb.c 23 Apr 2004 19:18:22 -0000 1.2 +++ programs/Xserver/hw/sun/sunCfb.c 19 Apr 2005 22:49:45 -0000 @@ -401,7 +401,6 @@ sunFbs[screen].EnterLeave = (void (*)())NoopDDA; pScreen->SaveScreen = CG2SaveScreen; -#ifndef LOWMEMFTPT if (mono) { pScreen->whitePixel = 0; pScreen->blackPixel = 1; @@ -410,15 +409,12 @@ mfbCreateDefColormap, CG2SaveScreen, 0); ((CG2Ptr) sunFbs[screen].fb)->regs.ppmask.reg = 1; } else { -#endif /* ifndef LOWMEMFTPT */ ret = sunInitCommon (screen, pScreen, (off_t) 0, sunCfbScreenInit, CG2ScreenInit, cfbCreateDefColormap, CG2SaveScreen, (int) &((struct cg2memfb *) 0)->pixplane); ((CG2Ptr) sunFbs[screen].fb)->regs.ppmask.reg = 0xFF; -#ifndef LOWMEMFTPT } -#endif /* ifndef LOWMEMFTPT */ return ret; } #endif /* INCLUDE_CG2_HEADER */ @@ -495,12 +491,10 @@ sunFbs[screen].info.fb_width, sunFbs[screen].info.fb_depth)) return FALSE; -#ifndef LOWMEMFTPT if (sunNoGX == FALSE) { if (!sunGXInit (pScreen, &sunFbs[screen])) return FALSE; } -#endif /* ifndef LOWMEMFTPT */ if (!sunCfbFinishScreenInit(pScreen, sunFbs[screen].fb + CG6_IMAGE_OFFSET, sunFbs[screen].info.fb_width, Index: programs/Xserver/hw/sun/sunCursor.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/sun/sunCursor.c,v retrieving revision 1.2 diff -u -d -r1.2 sunCursor.c --- programs/Xserver/hw/sun/sunCursor.c 23 Apr 2004 19:18:22 -0000 1.2 +++ programs/Xserver/hw/sun/sunCursor.c 19 Apr 2005 22:49:45 -0000 @@ -99,12 +99,7 @@ box.x2 = w; box.y2 = h; REGION_INIT(pScreen, &rgnDst, &box, 1); -#ifndef LOWMEMFTPT mfbDoBitblt(&src->drawable, &dst->drawable, GXcopy, &rgnDst, ptSrc); -#else - cfbDoBitblt(&src->drawable, &dst->drawable, GXcopy, &rgnDst, ptSrc, - 0xFFFFFFFF); -#endif /* ifndef LOWMEMFTPT */ REGION_UNINIT(pScreen, &rgnDst); FreeScratchPixmapHeader(src); FreeScratchPixmapHeader(dst); Index: programs/Xserver/hw/sun/sunInit.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/sun/sunInit.c,v retrieving revision 1.2 diff -u -d -r1.2 sunInit.c --- programs/Xserver/hw/sun/sunInit.c 23 Apr 2004 19:18:22 -0000 1.2 +++ programs/Xserver/hw/sun/sunInit.c 19 Apr 2005 22:49:46 -0000 @@ -71,9 +71,6 @@ #define BW2I sunBW2Init #endif /* } */ -#ifdef LOWMEMFTPT -#define BW2I NULL -#endif /* ifdef LOWMEMFTPT */ #if SUNMAXDEPTH == 1 /* { */ #define CG2I NULL Index: programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c,v retrieving revision 1.2 diff -u -d -r1.2 cfbgc.c --- programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c 23 Apr 2004 19:54:21 -0000 1.2 +++ programs/Xserver/hw/xfree86/xf8_32bpp/cfbgc.c 19 Apr 2005 22:49:46 -0000 @@ -104,11 +104,7 @@ #ifdef FOUR_BIT_CODE # define usePushPixels cfbPushPixels8 #else -#ifndef LOWMEMFTPT # define usePushPixels mfbPushPixels -#else -# define usePushPixels miPushPixels -#endif /* ifndef LOWMEMFTPT */ #endif #ifdef PIXEL_ADDR @@ -638,11 +634,7 @@ } #endif #ifdef FOUR_BIT_CODE -#ifndef LOWMEMFTPT pGC->ops->PushPixels = mfbPushPixels; -#else - pGC->ops->PushPixels = miPushPixels; -#endif /* ifndef LOWMEMFTPT */ if (pGC->fillStyle == FillSolid && devPriv->rop == GXcopy) pGC->ops->PushPixels = cfbPushPixels8; #endif Index: programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c,v retrieving revision 1.2 diff -u -d -r1.2 cfbgcunder.c --- programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c 23 Apr 2004 19:54:21 -0000 1.2 +++ programs/Xserver/hw/xfree86/xf8_32bpp/cfbgcunder.c 19 Apr 2005 22:49:46 -0000 @@ -85,11 +85,7 @@ #ifdef FOUR_BIT_CODE # define usePushPixels cfbPushPixels8 #else -#ifndef LOWMEMFTPT # define usePushPixels mfbPushPixels -#else -# define usePushPixels miPushPixels -#endif /* ifndef LOWMEMFTPT */ #endif #ifdef PIXEL_ADDR @@ -612,11 +608,7 @@ } #endif #ifdef FOUR_BIT_CODE -#ifndef LOWMEMFTPT pGC->ops->PushPixels = mfbPushPixels; -#else - pGC->ops->PushPixels = miPushPixels; -#endif /* ifndef LOWMEMFTPT */ if (pGC->fillStyle == FillSolid && devPriv->rop == GXcopy) pGC->ops->PushPixels = cfbPushPixels8; #endif Index: programs/Xserver/lmfcfb/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/lmfcfb/Imakefile,v retrieving revision 1.2 diff -u -d -r1.2 Imakefile --- programs/Xserver/lmfcfb/Imakefile 23 Apr 2004 19:54:25 -0000 1.2 +++ programs/Xserver/lmfcfb/Imakefile 19 Apr 2005 22:49:46 -0000 @@ -1,298 +0,0 @@ -XCOMM $Xorg: Imakefile,v 1.3 2000/08/17 19:53:32 cpqbld Exp $ - - - - -XCOMM $XFree86: xc/programs/Xserver/lmfcfb/Imakefile,v 1.3 1999/04/18 14:52:37 dawes Exp $ - -#include - -#ifndef PixelSize -#define PixelSize 8 -#endif - -#if PixelSize == 8 -/* cfb8cppl.c MUST come last to avoid confusing makedepend */ -PSZSRCS = cfb8bit.c cfbteblt8.c cfbglrop8.c cfbpush8.c cfbrctstp8.c cfb8cppl.c -PSZOBJS = cfb8bit.o cfbteblt8.o cfbglrop8.o cfbpush8.o cfbrctstp8.o cfb8cppl.o -#ifdef MipsArchitecture -#ifndef Mips64Architecture -STIPPLESRC = stipmips.s stipmipste.s -STIPPLEOBJ = stipmips.o stipmipste.o -STIPPLEDEF = -DHAS_STIPPLE_CODE -#endif -#endif -#ifdef SparcArchitecture -STIPPLESRC = stipsparc.s stipsparcte.s -STIPPLEOBJ = stipsparc.o stipsparcte.o -STIPPLEDEF = -DHAS_STIPPLE_CODE -#endif -#endif - -#if PixelSize == 32 -#ifdef SparcArchitecture -STIPPLESRC = stipsprc32.s stipsprcte32.s -STIPPLEOBJ = stipsprc32.o stipsprcte32.o -STIPPLEDEF = -DHAS_STIPPLE_CODE -#endif -#endif - - -MFBSRCS = maskbits.c mfbgc.c mfbfont.c \ - mfbscrinit.c mfbpixmap.c mfbmisc.c \ - mfbbitblt.c mfbclip.c mfbgetsp.c \ - mfbfillsp.c mfbpawhite.c mfbsetsp.c \ - mfbpablack.c mfbpainv.c \ - mfbplywhite.c mfbplyblack.c mfbplyinv.c \ - mfbigbwht.c mfbigbblak.c \ - mfbpgbblak.c mfbpgbwht.c mfbpgbinv.c \ - mfbtewhite.c mfbteblack.c \ - mfbfillrct.c mfbtileC.c mfbtileG.c - -MFBOBJS = maskbits.o mfbgc.o mfbfont.o \ - mfbscrinit.o mfbpixmap.o mfbmisc.o \ - mfbbitblt.o mfbclip.o mfbgetsp.o \ - mfbfillsp.o mfbpawhite.o mfbsetsp.o \ - mfbpablack.o mfbpainv.o \ - mfbplywhite.o mfbplyblack.o mfbplyinv.o \ - mfbigbwht.o mfbigbblak.o \ - mfbpgbblak.o mfbpgbwht.o mfbpgbinv.o \ - mfbtewhite.o mfbteblack.o \ - mfbfillrct.o mfbtileC.o mfbtileG.o - - -SRCS = cfbgc.c cfbrrop.c cfbwindow.c \ - cfbpntwin.c cfbmskbits.c cfbpixmap.c cfbbitblt.c \ - cfbfillsp.c cfbsetsp.c cfbscrinit.c cfballpriv.c \ - cfbgetsp.c cfbfillrct.c \ - cfbsolidC.c cfbsolidX.c cfbsolidG.c \ - cfbtileoddC.c cfbtileoddG.c cfbtile32C.c cfbtile32G.c \ - cfbcmap.c cfbzerarcC.c cfbzerarcX.c cfbzerarcG.c \ - cfbfillarcC.c cfbfillarcG.c \ - cfbigblt8.c cfbglblt8.c cfbtegblt.c cfbbstore.c \ - cfbbltC.c cfbbltX.c cfbbltO.c cfbbltG.c \ - cfbpolypnt.c \ - cfbbres.c cfbline.c cfbhrzvert.c cfbbresd.c cfbimage.c cfbseg.c \ - cfb8lineCO.c cfb8lineX.c cfb8lineG.c cfb8lineCP.c \ - cfb8segC.c cfb8segX.c cfb8segG.c cfb8segCS.c \ - cfbply1rctC.c cfbply1rctG.c $(PSZSRCS) $(MFBSRCS) - -OBJS = cfbgc.o cfbrrop.o cfbwindow.o \ - cfbgetsp.o cfbfillrct.o \ - cfbsolidC.o cfbsolidX.o cfbsolidG.o \ - cfbtileoddC.o cfbtileoddG.o cfbtile32C.o cfbtile32G.o \ - cfbfillsp.o cfbsetsp.o cfbscrinit.o cfballpriv.o \ - cfbpntwin.o cfbmskbits.o cfbpixmap.o \ - cfbcmap.o cfbzerarcC.o cfbzerarcX.o cfbzerarcG.o \ - cfbfillarcC.o cfbfillarcG.o \ - cfbigblt8.o cfbglblt8.o cfbtegblt.o cfbbstore.o \ - cfbpolypnt.o \ - cfbbres.o cfbline.o cfbhrzvert.o cfbbresd.o cfbimage.o cfbseg.o \ - cfb8lineCO.o cfb8lineX.o cfb8lineG.o cfb8lineCP.o \ - cfb8segCS.o cfb8segX.o cfb8segG.o cfb8segC.o \ - cfbbitblt.o cfbbltC.o cfbbltX.o cfbbltO.o cfbbltG.o \ - cfbply1rctC.o cfbply1rctG.o $(PSZOBJS) $(STIPPLEOBJ) $(MFBOBJS) - - INCLUDES = -I. -I../cfb -I../mfb -I../mi -I../include -I$(XINCLUDESRC) \ - -I$(FONTINCSRC) - LINTLIBS = ../dix/llib-ldix.ln ../os/llib-los.ln \ - ../mfb/llib-lmfb.ln ../mi/llib-lmi.ln - DEFINES = -DPSZ=PixelSize - -NormalLibraryObjectRule() -NormalLibraryTarget(cfb,$(OBJS)) -LintLibraryTarget(cfb,$(SRCS)) - -NormalLintTarget($(SRCS)) - -LinkSourceFile(cfb.h,../cfb) -LinkSourceFile(cfbmap.h,../cfb) -LinkSourceFile(cfballpriv.c,../cfb) -LinkSourceFile(cfbbitblt.c,../cfb) -LinkSourceFile(cfbblt.c,../cfb) -LinkSourceFile(cfbbres.c,../cfb) -LinkSourceFile(cfbbresd.c,../cfb) -LinkSourceFile(cfbbstore.c,../cfb) -LinkSourceFile(cfbcmap.c,../cfb) -LinkSourceFile(cfbfillarc.c,../cfb) -LinkSourceFile(cfbfillrct.c,../cfb) -LinkSourceFile(cfbfillsp.c,../cfb) -LinkSourceFile(cfbgc.c,../cfb) -LinkSourceFile(cfbgetsp.c,../cfb) -LinkSourceFile(cfbhrzvert.c,../cfb) -LinkSourceFile(cfbimage.c,../cfb) -LinkSourceFile(cfbline.c,../cfb) -LinkSourceFile(cfb8line.c,../cfb) -LinkSourceFile(cfbmskbits.c,../cfb) -LinkSourceFile(cfbmskbits.h,../cfb) -LinkSourceFile(cfbpixmap.c,../cfb) -LinkSourceFile(cfbply1rct.c,../cfb) -LinkSourceFile(cfbpntwin.c,../cfb) -LinkSourceFile(cfbpolypnt.c,../cfb) -LinkSourceFile(cfbrrop.c,../cfb) -LinkSourceFile(cfbrrop.h,../cfb) -LinkSourceFile(cfbscrinit.c,../cfb) -LinkSourceFile(cfbsetsp.c,../cfb) -LinkSourceFile(cfbsolid.c,../cfb) -LinkSourceFile(cfbigblt8.c,../cfb) -LinkSourceFile(cfbglblt8.c,../cfb) -LinkSourceFile(cfbtegblt.c,../cfb) -LinkSourceFile(cfbtileodd.c,../cfb) -LinkSourceFile(cfbtile32.c,../cfb) -LinkSourceFile(cfbwindow.c,../cfb) -LinkSourceFile(cfbzerarc.c,../cfb) -LinkSourceFile(cfb8bit.h,../cfb) -#if PixelSize == 8 -LinkSourceFile(cfb8bit.c,../cfb) -LinkSourceFile(cfb8cppl.c,../cfb) -LinkSourceFile(cfbpush8.c,../cfb) -LinkSourceFile(cfbrctstp8.c,../cfb) -LinkSourceFile(cfbteblt8.c,../cfb) -#ifdef MipsArchitecture -LinkSourceFile(stipmips.s,../cfb) -#endif -#ifdef SparcArchitecture -LinkSourceFile(stipsparc.s,../cfb) -#endif -#endif -#if PixelSize == 32 -#ifdef SparcArchitecture -LinkSourceFile(stipsprc32.s,LinkDirectory) -#endif -#endif - -LinkSourceFile(maskbits.c,../mfb) -LinkSourceFile(mfbgc.c,../mfb) -LinkSourceFile(mfbfont.c,../mfb) -LinkSourceFile(mfbscrinit.c,../mfb) -LinkSourceFile(mfbpixmap.c,../mfb) -LinkSourceFile(mfbmisc.c,../mfb) -LinkSourceFile(mfbbitblt.c,../mfb) -LinkSourceFile(mfbclip.c,../mfb) -LinkSourceFile(mfbgetsp.c,../mfb) -LinkSourceFile(mfbfillsp.c,../mfb) -LinkSourceFile(mfbsetsp.c,../mfb) -LinkSourceFile(mfbpntarea.c,../mfb) -LinkSourceFile(mfbply1rct.c,../mfb) -LinkSourceFile(mfbimggblt.c,../mfb) -LinkSourceFile(mfbplygblt.c,../mfb) -LinkSourceFile(mfbtegblt.c,../mfb) -LinkSourceFile(mfbfillrct.c,../mfb) -LinkSourceFile(mfbtile.c,../mfb) - -ObjectFromSpecialSource(cfbseg,cfbline,-DPOLYSEGMENT) - -ObjectFromSpecialSource(cfbfillarcC,cfbfillarc,-DRROP=GXcopy) -ObjectFromSpecialSource(cfbfillarcG,cfbfillarc,-DRROP=GXset) - -ObjectFromSpecialSource(cfbzerarcC,cfbzerarc,-DRROP=GXcopy) -ObjectFromSpecialSource(cfbzerarcX,cfbzerarc,-DRROP=GXxor) -ObjectFromSpecialSource(cfbzerarcG,cfbzerarc,-DRROP=GXset) - -ObjectFromSpecialSource(cfbbltC,cfbblt,-DMROP=Mcopy) -ObjectFromSpecialSource(cfbbltX,cfbblt,-DMROP=Mxor) -ObjectFromSpecialSource(cfbbltO,cfbblt,-DMROP=Mor) -ObjectFromSpecialSource(cfbbltG,cfbblt,-DMROP=0) - -ObjectFromSpecialSource(cfbsolidC,cfbsolid,-DRROP=GXcopy) -ObjectFromSpecialSource(cfbsolidX,cfbsolid,-DRROP=GXxor) -ObjectFromSpecialSource(cfbsolidG,cfbsolid,-DRROP=GXset) - -ObjectFromSpecialSource(cfbtileoddC,cfbtileodd,-DMROP=Mcopy) -ObjectFromSpecialSource(cfbtileoddG,cfbtileodd,-DMROP=0) - -ObjectFromSpecialSource(cfbtile32C,cfbtile32,-DMROP=Mcopy) -ObjectFromSpecialSource(cfbtile32G,cfbtile32,-DMROP=0) - -ObjectFromSpecialSource(cfb8lineCO,cfb8line,-DRROP=GXcopy) -ObjectFromSpecialSource(cfb8lineCP,cfb8line,-DRROP=GXcopy -DPREVIOUS) -ObjectFromSpecialSource(cfb8lineX,cfb8line,-DRROP=GXxor) -ObjectFromSpecialSource(cfb8lineG,cfb8line,-DRROP=GXset) - -ObjectFromSpecialSource(cfb8segCS,cfb8line,-DRROP=GXcopy -DPOLYSEGMENT -DWIDTH_SHIFT) -ObjectFromSpecialSource(cfb8segC,cfb8line,-DRROP=GXcopy -DPOLYSEGMENT) -ObjectFromSpecialSource(cfb8segX,cfb8line,-DRROP=GXxor -DPOLYSEGMENT) -ObjectFromSpecialSource(cfb8segG,cfb8line,-DRROP=GXset -DPOLYSEGMENT) - -ObjectFromSpecialSource(cfbply1rctC,cfbply1rct,-DRROP=GXcopy) -ObjectFromSpecialSource(cfbply1rctG,cfbply1rct,-DRROP=GXset) - -ObjectFromSpecialSource(mfbpawhite,mfbpntarea,-DMFBSOLIDFILLAREA=mfbSolidWhiteArea -DMFBSTIPPLEFILLAREA=mfbStippleWhiteArea -DOPEQ=MFB_OPEQ_WHITE -DEQWHOLEWORD=MFB_EQWHOLEWORD_WHITE) - -ObjectFromSpecialSource(mfbpablack,mfbpntarea,-DMFBSOLIDFILLAREA=mfbSolidBlackArea -DMFBSTIPPLEFILLAREA=mfbStippleBlackArea -DOPEQ=MFB_OPEQ_BLACK -DEQWHOLEWORD=MFB_EQWHOLEWORD_BLACK) - -ObjectFromSpecialSource(mfbpainv,mfbpntarea,-DMFBSOLIDFILLAREA=mfbSolidInvertArea -DMFBSTIPPLEFILLAREA=mfbStippleInvertArea -DOPEQ=MFB_OPEQ_INVERT -DEQWHOLEWORD=MFB_EQWHOLEWORD_INVERT) - -ObjectFromSpecialSource(mfbplywhite,mfbply1rct,-DMFBFILLPOLY1RECT=mfbFillPolyWhite -DOPEQ=MFB_OPEQ_WHITE -DEQWHOLEWORD=MFB_EQWHOLEWORD_WHITE) - -ObjectFromSpecialSource(mfbplyblack,mfbply1rct,-DMFBFILLPOLY1RECT=mfbFillPolyBlack -DOPEQ=MFB_OPEQ_BLACK -DEQWHOLEWORD=MFB_EQWHOLEWORD_BLACK) - -ObjectFromSpecialSource(mfbplyinv,mfbply1rct,-DMFBFILLPOLY1RECT=mfbFillPolyInvert -DOPEQ=MFB_OPEQ_INVERT -DEQWHOLEWORD=MFB_EQWHOLEWORD_INVERT) - -ObjectFromSpecialSource(mfbigbwht,mfbimggblt,-DMFBIMAGEGLYPHBLT=mfbImageGlyphBltWhite -DOPEQ=MFB_OPEQ_WHITE) - -ObjectFromSpecialSource(mfbigbblak,mfbimggblt,-DMFBIMAGEGLYPHBLT=mfbImageGlyphBltBlack -DOPEQ=MFB_OPEQ_BLACK) - -ObjectFromSpecialSource(mfbpgbwht,mfbplygblt,-DMFBPOLYGLYPHBLT=mfbPolyGlyphBltWhite -DOPEQ=MFB_OPEQ_WHITE) - -ObjectFromSpecialSource(mfbpgbblak,mfbplygblt,-DMFBPOLYGLYPHBLT=mfbPolyGlyphBltBlack -DOPEQ=MFB_OPEQ_BLACK) - -ObjectFromSpecialSource(mfbpgbinv,mfbplygblt,-DMFBPOLYGLYPHBLT=mfbPolyGlyphBltInvert -DOPEQ=MFB_OPEQ_INVERT) - -ObjectFromSpecialSource(mfbtewhite,mfbtegblt,-DMFBTEGLYPHBLT=mfbTEGlyphBltWhite -DOP=MFB_OP_WHITE -DCLIPTETEXT=mfbImageGlyphBltWhite) - -ObjectFromSpecialSource(mfbteblack,mfbtegblt,-DMFBTEGLYPHBLT=mfbTEGlyphBltBlack -DOP=MFB_OP_BLACK -DCLIPTETEXT=mfbImageGlyphBltBlack) - -ObjectFromSpecialSource(mfbtileC,mfbtile,-DMROP=Mcopy) - -ObjectFromSpecialSource(mfbtileG,mfbtile,-DMROP=0) - -SpecialCObjectRule(cfbglblt8,$(_NOOP_),$(STIPPLEDEF)) -SpecialCObjectRule(cfbpixmap,$(ICONFIGFILES),$(_NOOP_)) - -#if PixelSize == 8 -ObjectFromSpecialSource(cfbglrop8,cfbglblt8,-DGLYPHROP) - -#ifdef MipsArchitecture -stipmipste.s: stipmips.s - $(RM) $@ - $(LN) stipmips.s stipmipste.s -clean:: - $(RM) stipmipste.s - -stipmipste.o: stipmipste.s - $(AS) -o $@ -DTETEXT stipmipste.s -#endif - -#ifdef SparcArchitecture -stipsparcte.s: stipsparc.s - $(RM) $@ - $(LN) stipsparc.s stipsparcte.s -clean:: - $(RM) stipsparcte.s - -stipsparc.o: stipsparc.s - $(CPP) stipsparc.s | $(AS) -o $@ - - -stipsparcte.o: stipsparcte.s - $(CPP) -DTETEXT stipsparcte.s | $(AS) -o $@ - -#endif -#endif - -#if PixelSize == 32 -#ifdef SparcArchitecture -stipsprcte32.s: stipsprc32.s - $(RM) $@ - $(LN) stipsprc32.s stipsprcte32.s -clean:: - $(RM) stipsprcte32.s - -stipsprc32.o: stipsprc32.s - $(CPP) stipsprc32.s | $(AS) -o $@ - - -stipsprcte32.o: stipsprcte32.s - $(CPP) -DTETEXT stipsprcte32.s | $(AS) -o $@ - -#endif -#endif - -DependTarget() Index: programs/Xserver/mfb/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/mfb/Imakefile,v retrieving revision 1.2 diff -u -d -r1.2 Imakefile --- programs/Xserver/mfb/Imakefile 23 Apr 2004 19:54:25 -0000 1.2 +++ programs/Xserver/mfb/Imakefile 19 Apr 2005 22:49:46 -0000 @@ -22,10 +22,6 @@ XFMODOBJ = mfbmodule.o #endif -#if BuildLowMem -DEFINES=-ULOWMEMFTPT -#endif - SRCS1 = mfbgc.c mfbwindow.c mfbfont.c \ mfbfillrct.c mfbpntwin.c maskbits.c mfbpixmap.c \ mfbimage.c mfbline.c mfbbres.c mfbhrzvert.c mfbbresd.c \ Index: programs/Xserver/mfb/maskbits.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/mfb/maskbits.c,v retrieving revision 1.4 diff -u -d -r1.4 maskbits.c --- programs/Xserver/mfb/maskbits.c 14 Jan 2005 08:37:30 -0000 1.4 +++ programs/Xserver/mfb/maskbits.c 19 Apr 2005 22:49:46 -0000 @@ -150,7 +150,6 @@ LONG2CHARS( 0xFFFFFFFF ) }; -#ifndef LOWMEMFTPT #ifdef NEED_OLD_MFB_MASKS /* a hack, for now, since the entries for 0 need to be all @@ -233,7 +232,6 @@ }; #endif /* NEED_OLD_MFB_MASKS */ -#endif /* ifndef LOWMEMFTPT */ PixelType partmasks[PPW][PPW] = { {LONG2CHARS( 0xFFFFFFFF ), LONG2CHARS( 0x80000000 ), LONG2CHARS( 0xC0000000 ), LONG2CHARS( 0xE0000000 ), @@ -575,7 +573,6 @@ LONG2CHARS( 0xFFFFFFFF ) }; -#ifndef LOWMEMFTPT #ifdef NEED_OLD_MFB_MASKS /* a hack ), for now, since the entries for 0 need to be all @@ -658,7 +655,6 @@ }; #endif -#endif /* ifndef LOWMEMFTPT */ PixelType partmasks[PPW][PPW] = { {LONG2CHARS( 0xFFFFFFFF ), LONG2CHARS( 0x00000001 ), LONG2CHARS( 0x00000003 ), LONG2CHARS( 0x00000007 ), Index: programs/Xserver/mfb/mfbbitblt.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/mfb/mfbbitblt.c,v retrieving revision 1.2 diff -u -d -r1.2 mfbbitblt.c --- programs/Xserver/mfb/mfbbitblt.c 23 Apr 2004 19:54:25 -0000 1.2 +++ programs/Xserver/mfb/mfbbitblt.c 19 Apr 2005 22:49:47 -0000 @@ -93,7 +93,6 @@ ** and much less overhead. Nice for drawing lots of small pixmaps. */ -#ifndef LOWMEMFTPT void mfbDoBitblt (pSrc, pDst, alu, prgnDst, pptSrc) @@ -388,7 +387,6 @@ return prgnExposed; } -#endif /* ifndef LOWMEMFTPT */ /* * Devices which use mfb for 1-bit pixmap support @@ -437,7 +435,6 @@ */ -#ifndef LOWMEMFTPT RegionPtr mfbCopyPlane(pSrcDrawable, pDstDrawable, @@ -507,4 +504,3 @@ return prgnExposed; } -#endif /* ifndef LOWMEMFTPT */ Index: programs/Xserver/mfb/mfbgc.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/mfb/mfbgc.c,v retrieving revision 1.3 diff -u -d -r1.3 mfbgc.c --- programs/Xserver/mfb/mfbgc.c 14 Jan 2005 08:37:30 -0000 1.3 +++ programs/Xserver/mfb/mfbgc.c 19 Apr 2005 22:49:47 -0000 @@ -73,7 +73,6 @@ miCopyClip }; -#ifndef LOWMEMFTPT static GCOps whiteTECopyOps = { mfbWhiteSolidFS, @@ -361,295 +360,6 @@ #endif }; -#else - -static GCOps whiteTECopyOps = { - mfbWhiteSolidFS, - mfbSetSpans, - miPutImage, - miCopyArea, - miCopyPlane, - miPolyPoint, - miZeroLine, - miPolySegment, - miPolyRectangle, - miZeroPolyArc, - mfbFillPolyWhite, - mfbPolyFillRect, - miPolyFillArc, - miPolyText8, - miPolyText16, - miImageText8, - miImageText16, - mfbTEGlyphBltWhite, - mfbPolyGlyphBltWhite, - miPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif -}; - -static GCOps blackTECopyOps = { - mfbBlackSolidFS, - mfbSetSpans, - miPutImage, - miCopyArea, - miCopyPlane, - miPolyPoint, - miZeroLine, - miPolySegment, - miPolyRectangle, - miZeroPolyArc, - mfbFillPolyBlack, - mfbPolyFillRect, - miPolyFillArc, - miPolyText8, - miPolyText16, - miImageText8, - miImageText16, - mfbTEGlyphBltBlack, - mfbPolyGlyphBltBlack, - miPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif -}; - -static GCOps whiteTEInvertOps = { - mfbInvertSolidFS, - mfbSetSpans, - miPutImage, - miCopyArea, - miCopyPlane, - miPolyPoint, - miZeroLine, - miPolySegment, - miPolyRectangle, - miZeroPolyArc, - mfbFillPolyInvert, - mfbPolyFillRect, - miPolyFillArc, - miPolyText8, - miPolyText16, - miImageText8, - miImageText16, - mfbTEGlyphBltWhite, - mfbPolyGlyphBltInvert, - miPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif -}; - -static GCOps blackTEInvertOps = { - mfbInvertSolidFS, - mfbSetSpans, - miPutImage, - miCopyArea, - miCopyPlane, - miPolyPoint, - miZeroLine, - miPolySegment, - miPolyRectangle, - miZeroPolyArc, - mfbFillPolyInvert, - mfbPolyFillRect, - miPolyFillArc, - miPolyText8, - miPolyText16, - miImageText8, - miImageText16, - mfbTEGlyphBltBlack, - mfbPolyGlyphBltInvert, - miPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif -}; - -static GCOps whiteCopyOps = { - mfbWhiteSolidFS, - mfbSetSpans, - miPutImage, - miCopyArea, - miCopyPlane, - miPolyPoint, - miZeroLine, - miPolySegment, - miPolyRectangle, - miZeroPolyArc, - mfbFillPolyWhite, - mfbPolyFillRect, - miPolyFillArc, - miPolyText8, - miPolyText16, - miImageText8, - miImageText16, - mfbImageGlyphBltWhite, - mfbPolyGlyphBltWhite, - miPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif -}; - -static GCOps blackCopyOps = { - mfbBlackSolidFS, - mfbSetSpans, - miPutImage, - miCopyArea, - miCopyPlane, - miPolyPoint, - miZeroLine, - miPolySegment, - miPolyRectangle, - miZeroPolyArc, - mfbFillPolyBlack, - mfbPolyFillRect, - miPolyFillArc, - miPolyText8, - miPolyText16, - miImageText8, - miImageText16, - mfbImageGlyphBltBlack, - mfbPolyGlyphBltBlack, - miPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif -}; - -static GCOps whiteInvertOps = { - mfbInvertSolidFS, - mfbSetSpans, - miPutImage, - miCopyArea, - miCopyPlane, - miPolyPoint, - miZeroLine, - miPolySegment, - miPolyRectangle, - miZeroPolyArc, - mfbFillPolyInvert, - mfbPolyFillRect, - miPolyFillArc, - miPolyText8, - miPolyText16, - miImageText8, - miImageText16, - mfbImageGlyphBltWhite, - mfbPolyGlyphBltInvert, - miPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif -}; - -static GCOps blackInvertOps = { - mfbInvertSolidFS, - mfbSetSpans, - miPutImage, - miCopyArea, - miCopyPlane, - miPolyPoint, - miZeroLine, - miPolySegment, - miPolyRectangle, - miZeroPolyArc, - mfbFillPolyInvert, - mfbPolyFillRect, - miPolyFillArc, - miPolyText8, - miPolyText16, - miImageText8, - miImageText16, - mfbImageGlyphBltBlack, - mfbPolyGlyphBltInvert, - miPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif -}; - -static GCOps whiteWhiteCopyOps = { - mfbWhiteSolidFS, - mfbSetSpans, - miPutImage, - miCopyArea, - miCopyPlane, - miPolyPoint, - miZeroLine, - miPolySegment, - miPolyRectangle, - miZeroPolyArc, - mfbFillPolyWhite, - mfbPolyFillRect, - miPolyFillArc, - miPolyText8, - miPolyText16, - miImageText8, - miImageText16, - miImageGlyphBlt, - mfbPolyGlyphBltWhite, - miPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif -}; - -static GCOps blackBlackCopyOps = { - mfbBlackSolidFS, - mfbSetSpans, - miPutImage, - miCopyArea, - miCopyPlane, - miPolyPoint, - miZeroLine, - miPolySegment, - miPolyRectangle, - miZeroPolyArc, - mfbFillPolyBlack, - mfbPolyFillRect, - miPolyFillArc, - miPolyText8, - miPolyText16, - miImageText8, - miImageText16, - miImageGlyphBlt, - mfbPolyGlyphBltBlack, - miPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif -}; - -static GCOps fgEqBgInvertOps = { - mfbInvertSolidFS, - mfbSetSpans, - miPutImage, - miCopyArea, - miCopyPlane, - miPolyPoint, - miZeroLine, - miPolySegment, - miPolyRectangle, - miZeroPolyArc, - mfbFillPolyInvert, - mfbPolyFillRect, - miPolyFillArc, - miPolyText8, - miPolyText16, - miImageText8, - miImageText16, - miImageGlyphBlt, - mfbPolyGlyphBltInvert, - miPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif -}; - -#endif /* ifndef LOWMEMFTPT */ struct commonOps { int fg, bg; @@ -1047,12 +757,10 @@ { if (pGC->lineWidth == 0) { -#ifndef LOWMEMFTPT if ((pGC->lineStyle == LineSolid) && (pGC->fillStyle == FillSolid) && ((rrop == RROP_WHITE) || (rrop == RROP_BLACK))) pGC->ops->PolyArc = mfbZeroPolyArcSS; else -#endif /* ifndef LOWMEMFTPT */ pGC->ops->PolyArc = miZeroPolyArc; } else @@ -1061,14 +769,12 @@ { if(pGC->lineWidth == 0) { -#ifndef LOWMEMFTPT if (pGC->fillStyle == FillSolid) { pGC->ops->PolySegment = mfbSegmentSS; pGC->ops->Polylines = mfbLineSS; } else -#endif /* ifndef LOWMEMFTPT */ { pGC->ops->PolySegment = miPolySegment; pGC->ops->Polylines = miZeroLine; @@ -1082,14 +788,12 @@ } else { -#ifndef LOWMEMFTPT if(pGC->lineWidth == 0 && pGC->fillStyle == FillSolid) { pGC->ops->Polylines = mfbLineSD; pGC->ops->PolySegment = mfbSegmentSD; } else -#endif /* ifndef LOWMEMFTPT */ { pGC->ops->Polylines = miWideDash; pGC->ops->PolySegment = miPolySegment; @@ -1111,7 +815,6 @@ { /* special case ImageGlyphBlt for terminal emulator fonts */ -#ifndef LOWMEMFTPT if ((pGC->font) && TERMINALFONT(pGC->font) && @@ -1128,7 +831,6 @@ } else -#endif /* ifndef LOWMEMFTPT */ { if (pGC->fgPixel & 1) @@ -1162,7 +864,6 @@ if (new_fill) -#ifndef LOWMEMFTPT { /* install a suitable fillspans and pushpixels */ @@ -1299,138 +1000,6 @@ } /* end of natural rectangles */ } /* end of new_fill */ -#else - - { - /* install a suitable fillspans and pushpixels */ - pGC->ops->PushPixels = miPushPixels; - pGC->ops->FillPolygon = miFillPolygon; - if ((pGC->fillStyle == FillSolid) || - ((pGC->fillStyle == FillOpaqueStippled) && - ((pGC->fgPixel & 1) == (pGC->bgPixel & 1)))) - { - pGC->ops->PushPixels = miPushPixels; - switch(devPriv->rop) - { - case RROP_WHITE: - pGC->ops->FillSpans = mfbWhiteSolidFS; - pGC->ops->FillPolygon = mfbFillPolyWhite; - break; - case RROP_BLACK: - pGC->ops->FillSpans = mfbBlackSolidFS; - pGC->ops->FillPolygon = mfbFillPolyBlack; - break; - case RROP_INVERT: - pGC->ops->FillSpans = mfbInvertSolidFS; - pGC->ops->FillPolygon = mfbFillPolyInvert; - break; - case RROP_NOP: - pGC->ops->FillSpans = (void (*)())NoopDDA; - pGC->ops->FillPolygon = (void (*)())NoopDDA; - break; - } - } - /* beyond this point, opaqueStippled ==> fg != bg */ - else if (((pGC->fillStyle == FillTiled) || - (pGC->fillStyle == FillOpaqueStippled)) && - !pGC->pRotatedPixmap) - { - pGC->ops->FillSpans = mfbUnnaturalTileFS; - } - else if ((pGC->fillStyle == FillStippled) && !pGC->pRotatedPixmap) - { - pGC->ops->FillSpans = mfbUnnaturalStippleFS; - } - else if (pGC->fillStyle == FillStippled) - { - switch(devPriv->rop) - { - case RROP_WHITE: - pGC->ops->FillSpans = mfbWhiteStippleFS; - case RROP_BLACK: - pGC->ops->FillSpans = mfbBlackStippleFS; - case RROP_INVERT: - pGC->ops->FillSpans = mfbInvertStippleFS; - case RROP_NOP: - pGC->ops->FillSpans = (void (*)())NoopDDA; - break; - } - } - else /* overload tiles to do parti-colored opaque stipples */ - { - pGC->ops->FillSpans = mfbTileFS; - } - pGC->ops->PolyFillArc = miPolyFillArc; - /* the rectangle code doesn't deal with opaque stipples that - are two colors -- we can fool it for fg==bg, though - */ - if ((((pGC->fillStyle == FillTiled) || - (pGC->fillStyle == FillStippled)) && - !pGC->pRotatedPixmap) || - ((pGC->fillStyle == FillOpaqueStippled) && - ((pGC->fgPixel & 1) != (pGC->bgPixel & 1))) - ) - { - pGC->ops->PolyFillRect = miPolyFillRect; - } - else /* deal with solids and natural stipples and tiles */ - { - pGC->ops->PolyFillRect = mfbPolyFillRect; - - if ((pGC->fillStyle == FillSolid) || - ((pGC->fillStyle == FillOpaqueStippled) && - ((pGC->fgPixel & 1) == (pGC->bgPixel & 1)))) - { - switch(devPriv->rop) - { - case RROP_WHITE: - devPriv->FillArea = mfbSolidWhiteArea; - break; - case RROP_BLACK: - devPriv->FillArea = mfbSolidBlackArea; - break; - case RROP_INVERT: - devPriv->FillArea = mfbSolidInvertArea; - break; - case RROP_NOP: - devPriv->FillArea = (mfbFillAreaProcPtr)NoopDDA; - break; - } - } - else if (pGC->fillStyle == FillStippled) - { - switch(devPriv->rop) - { - case RROP_WHITE: - devPriv->FillArea = mfbStippleWhiteArea; - break; - case RROP_BLACK: - devPriv->FillArea = mfbStippleBlackArea; - break; - case RROP_INVERT: - devPriv->FillArea = mfbStippleInvertArea; - break; - case RROP_NOP: - devPriv->FillArea = (mfbFillAreaProcPtr)NoopDDA; - break; - } - } - else /* deal with tiles */ - { - switch (pGC->alu) - { - case GXcopy: - devPriv->FillArea = mfbTileAreaPPWCopy; - break; - default: - devPriv->FillArea = mfbTileAreaPPWGeneral; - break; - } - } - } /* end of natural rectangles */ - } /* end of new_fill */ - -#endif /* ifndef LOWMEMFTPT */ } Index: programs/Xserver/mfb/mfbimggblt.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/mfb/mfbimggblt.c,v retrieving revision 1.2 diff -u -d -r1.2 mfbimggblt.c --- programs/Xserver/mfb/mfbimggblt.c 23 Apr 2004 19:54:25 -0000 1.2 +++ programs/Xserver/mfb/mfbimggblt.c 19 Apr 2005 22:49:47 -0000 @@ -190,11 +190,7 @@ else pPrivGC->FillArea = mfbSolidBlackArea; -#ifndef LOWMEMFTPT mfbPolyFillRect(pDrawable, pGC, 1, &backrect); -#else - miPolyFillRect(pDrawable, pGC, 1, &backrect); -#endif pPrivGC->FillArea = oldFillArea; /* the faint-hearted can open their eyes now */ Index: programs/Xserver/mfb/mfbpixmap.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/mfb/mfbpixmap.c,v retrieving revision 1.1.1.1 diff -u -d -r1.1.1.1 mfbpixmap.c --- programs/Xserver/mfb/mfbpixmap.c 14 Nov 2003 16:48:57 -0000 1.1.1.1 +++ programs/Xserver/mfb/mfbpixmap.c 19 Apr 2005 22:49:47 -0000 @@ -62,7 +62,6 @@ #include "servermd.h" -#ifndef LOWMEMFTPT PixmapPtr mfbCreatePixmap (pScreen, width, height, depth) @@ -104,7 +103,6 @@ return pPixmap; } -#endif /* ifndef LOWMEMFTPT */ Bool mfbDestroyPixmap(pPixmap) Index: programs/Xserver/mfb/mfbscrinit.c =================================================================== RCS file: /cvs/xorg/xc/programs/Xserver/mfb/mfbscrinit.c,v retrieving revision 1.3 diff -u -d -r1.3 mfbscrinit.c --- programs/Xserver/mfb/mfbscrinit.c 30 Jul 2004 20:30:57 -0000 1.3 +++ programs/Xserver/mfb/mfbscrinit.c 19 Apr 2005 22:49:47 -0000 @@ -85,7 +85,6 @@ 1, 1, &VID }; -#ifndef LOWMEMFTPT BSFuncRec mfbBSFuncRec = { mfbSaveAreas, @@ -95,7 +94,6 @@ (BackingStoreGetSpansPixmapProcPtr) 0, }; -#endif /* ifndef LOWMEMFTPT */ Bool mfbAllocatePrivates(pScreen, pWinIndex, pGCIndex) @@ -124,7 +122,6 @@ AllocateGCPrivate(pScreen, mfbGCPrivateIndex, sizeof(mfbPrivGC))); } -#ifndef LOWMEMFTPT /* dts * (inch/dot) * (25.4 mm / inch) = mm */ Bool @@ -171,7 +168,6 @@ pScreen->BackingStoreFuncs = mfbBSFuncRec; return TRUE; } -#endif /* ifndef LOWMEMFTPT */ PixmapPtr mfbGetWindowPixmap(pWin) Index: programs/xfs/difs/Imakefile =================================================================== RCS file: /cvs/xorg/xc/programs/xfs/difs/Imakefile,v retrieving revision 1.3 diff -u -d -r1.3 Imakefile --- programs/xfs/difs/Imakefile 25 Apr 2004 23:16:59 -0000 1.3 +++ programs/xfs/difs/Imakefile 19 Apr 2005 22:49:47 -0000 @@ -29,12 +29,7 @@ INCLUDES = -I../include -I$(FONTINCSRC) -I$(EXTINCSRC) -I$(FONTLIBSRC)/include DEFINES = AllocateLocalDefines VendorReleaseDefines VendorDefines -#if BuildLowMem -LOWMEMDEFINES = -DLOWMEMFTPT -#else -LOWMEMDEFINES = -#endif -FONTDEFINES = -DFONT_PCF -DFONT_FS -DFONT_SPEEDO $(LOWMEMDEFINES) +FONTDEFINES = -DFONT_PCF -DFONT_FS -DFONT_SPEEDO #ifdef DefaultFSConfigFile DEFAULTCONFIGFILE = DefaultFSConfigFile CONFIGDEFINES = -DDEFAULT_CONFIG_FILE=\"$(DEFAULTCONFIGFILE)\" Index: programs/xfs/difs/initfonts.c =================================================================== RCS file: /cvs/xorg/xc/programs/xfs/difs/initfonts.c,v retrieving revision 1.2 diff -u -d -r1.2 initfonts.c --- programs/xfs/difs/initfonts.c 23 Apr 2004 19:54:47 -0000 1.2 +++ programs/xfs/difs/initfonts.c 19 Apr 2005 22:49:47 -0000 @@ -124,14 +124,6 @@ #ifdef FONT_PCF FontFileRegisterFpeFunctions(); -#ifdef LOWMEMFTPT - -#ifndef CRAY - SpeedoRegisterFontFileFunctions (); - Type1RegisterFontFileFunctions(); -#endif - -#endif /* ifdef LOWMEMFTPT */ #endif