andreacavalli/xserver-multidpi
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Bug #3069: Drop the BuildLowMem hack, it doesn't compile and isn't useful.

Browse Source
This commit is contained in:
Adam Jackson 2005-04-22 20:49:50 +00:00
parent d450a70e00
commit 07bd7df6a6
11 changed files with 0 additions and 481 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cfb/cfbgc.c
View File

@ -90,11 +90,7 @@ static void cfbUnPushPixels (GCPtr, PixmapPtr, DrawablePtr, int, int, int, int);
#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 @@ cfbValidateGC(pGC, changes, pDrawable)
}
#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

4
cfb/cfbimage.c
View File

@ -143,11 +143,7 @@ cfbGetImage(pDrawable, sx, sy, w, h, format, planeMask, pdstLine)
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;

4
cfb/cfbpush8.c
View File

@ -76,11 +76,7 @@ cfbPushPixels8 (pGC, pBitmap, pDrawable, dx, dy, xOrg, yOrg)
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;
}

8
hw/xfree86/xf8_32bpp/cfbgc.c
View File

@ -104,11 +104,7 @@ LOWMEMFTPT False False False False
#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 @@ cfb8_32ValidateGC32(
}
#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

8
hw/xfree86/xf8_32bpp/cfbgcunder.c
View File

@ -85,11 +85,7 @@ SOFTWARE.
#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 @@ cfb32ValidateGC_Underlay(
}
#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

4
mfb/maskbits.c
View File

@ -150,7 +150,6 @@ PixelType endtab[PPW+1] =
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 @@ PixelType endpartial[33] =
};
#endif /* NEED_OLD_MFB_MASKS */
#endif /* ifndef LOWMEMFTPT */
PixelType partmasks[PPW][PPW] = {
{LONG2CHARS( 0xFFFFFFFF ), LONG2CHARS( 0x80000000 ), LONG2CHARS( 0xC0000000 ), LONG2CHARS( 0xE0000000 ),
@ -575,7 +573,6 @@ PixelType endtab[PPW+1] =
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 @@ PixelType endpartial[33] =
};
#endif
#endif /* ifndef LOWMEMFTPT */
PixelType partmasks[PPW][PPW] = {
{LONG2CHARS( 0xFFFFFFFF ), LONG2CHARS( 0x00000001 ), LONG2CHARS( 0x00000003 ), LONG2CHARS( 0x00000007 ),

4
mfb/mfbbitblt.c
View File

@ -93,7 +93,6 @@ destination. this is a simple translation.
** and much less overhead. Nice for drawing lots of small pixmaps.
*/
#ifndef LOWMEMFTPT
void
mfbDoBitblt (pSrc, pDst, alu, prgnDst, pptSrc)
@ -388,7 +387,6 @@ int dstx, dsty;
return prgnExposed;
}
#endif /* ifndef LOWMEMFTPT */
/*
* Devices which use mfb for 1-bit pixmap support
@ -437,7 +435,6 @@ CopyArea().
*/
#ifndef LOWMEMFTPT
RegionPtr
mfbCopyPlane(pSrcDrawable, pDstDrawable,
@ -507,4 +504,3 @@ unsigned long plane;
return prgnExposed;
}
#endif /* ifndef LOWMEMFTPT */

431
mfb/mfbgc.c
View File

@ -73,7 +73,6 @@ static GCFuncs mfbFuncs = {
miCopyClip
};
#ifndef LOWMEMFTPT
static GCOps whiteTECopyOps = {
mfbWhiteSolidFS,
@ -361,295 +360,6 @@ static GCOps fgEqBgInvertOps = {
#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 @@ mfbValidateGC(pGC, changes, pDrawable)
{
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 @@ mfbValidateGC(pGC, changes, pDrawable)
{
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 @@ mfbValidateGC(pGC, changes, pDrawable)
}
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 @@ mfbValidateGC(pGC, changes, pDrawable)
{
/* special case ImageGlyphBlt for terminal emulator fonts */
#ifndef LOWMEMFTPT
if ((pGC->font) &&
TERMINALFONT(pGC->font) &&
@ -1128,7 +831,6 @@ mfbValidateGC(pGC, changes, pDrawable)
}
else
#endif /* ifndef LOWMEMFTPT */
{
if (pGC->fgPixel & 1)
@ -1162,7 +864,6 @@ mfbValidateGC(pGC, changes, pDrawable)
if (new_fill)
#ifndef LOWMEMFTPT
{
/* install a suitable fillspans and pushpixels */
@ -1299,138 +1000,6 @@ mfbValidateGC(pGC, changes, pDrawable)
} /* 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 */
}

4
mfb/mfbimggblt.c
View File

@ -190,11 +190,7 @@ MFBIMAGEGLYPHBLT(pDrawable, pGC, x, y, nglyph, ppci, pglyphBase)
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 */

2
mfb/mfbpixmap.c
View File

@ -62,7 +62,6 @@ SOFTWARE.
#include "servermd.h"
#ifndef LOWMEMFTPT
PixmapPtr
mfbCreatePixmap (pScreen, width, height, depth)
@ -104,7 +103,6 @@ mfbCreatePixmap (pScreen, width, height, depth)
return pPixmap;
}
#endif /* ifndef LOWMEMFTPT */
Bool
mfbDestroyPixmap(pPixmap)

4
mfb/mfbscrinit.c
View File

@ -85,7 +85,6 @@ static DepthRec depth = {
1, 1, &VID
};
#ifndef LOWMEMFTPT
BSFuncRec mfbBSFuncRec = {
mfbSaveAreas,
@ -95,7 +94,6 @@ BSFuncRec mfbBSFuncRec = {
(BackingStoreGetSpansPixmapProcPtr) 0,
};
#endif /* ifndef LOWMEMFTPT */
Bool
mfbAllocatePrivates(pScreen, pWinIndex, pGCIndex)
@ -124,7 +122,6 @@ mfbAllocatePrivates(pScreen, pWinIndex, pGCIndex)
AllocateGCPrivate(pScreen, mfbGCPrivateIndex, sizeof(mfbPrivGC)));
}
#ifndef LOWMEMFTPT
/* dts * (inch/dot) * (25.4 mm / inch) = mm */
Bool
@ -171,7 +168,6 @@ mfbScreenInit(pScreen, pbits, xsize, ysize, dpix, dpiy, width)
pScreen->BackingStoreFuncs = mfbBSFuncRec;
return TRUE;
}
#endif /* ifndef LOWMEMFTPT */
PixmapPtr
mfbGetWindowPixmap(pWin)