diff options
| author | Adam Jackson <ajax@nwnk.net> | 2006-04-30 19:16:14 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2006-04-30 19:16:14 +0000 |
| commit | 291e89d4f2a4bb3177b2dfe6421680e23f120b8e (patch) | |
| tree | 7bc1818c4774751696b1d0cc3b568c883c2184a8 | |
| parent | fdcacc5a4bc1d6cb7347fc66041a9c686c5c74d1 (diff) | |
Remove NEED_LINEHELPER BC cruft for pre-R6 DDXes.
35 files changed, 40 insertions, 208 deletions
@@ -1,3 +1,41 @@ +2006-04-30 Adam Jackson <ajax@freedesktop.org> + + * Xprint/pcl/PclGC.c: + * Xprint/ps/PsGC.c: + * afb/afbgc.c: + * cfb/cfbgc.c: + * exa/exa_accel.c: + * fb/fbgc.c: + * fb/fbpseudocolor.c: + * hw/kdrive/igs/igsdraw.c: + * hw/kdrive/savage/s3draw.c: + * hw/kdrive/savage/s3gc.c: + * hw/kdrive/sis530/sisdraw.c: + * hw/kdrive/src/kaa.c: + * hw/kdrive/src/kasync.c: + * hw/kdrive/src/knoop.c: + * hw/xfree86/rac/xf86RAC.c: + * hw/xfree86/shadowfb/shadow.c: + * hw/xfree86/xaa/xaaFallback.c: + * hw/xfree86/xaa/xaaGC.c: + * hw/xfree86/xf4bpp/ppcGC.c: + * hw/xfree86/xf4bpp/vgaGC.c: + * hw/xfree86/xf8_32bpp/cfbgc.c: + * hw/xfree86/xf8_32bpp/cfbgcunder.c: + * hw/xfree86/xf8_32bpp/xf86overlay.c: + * hw/xgl/xglgc.c: + * hw/xwin/wingc.c: + * include/gcstruct.h: + * mfb/mfbgc.c: + * mi/mi.h: + * mi/mibank.c: + * mi/mibstore.c: + * mi/miwideline.c: + * miext/damage/damage.c: + * miext/rootless/rootlessGC.c: + * miext/rootless/accel/rlAccel.c: + Remove NEED_LINEHELPER BC cruft for pre-R6 DDXes. + 2006-04-27 Eric Anholt <anholt@FreeBSD.org> * exa/exa_accel.c: (exaPolyPoint), (exaPolylines), diff --git a/Xprint/pcl/PclGC.c b/Xprint/pcl/PclGC.c index 2be2ef787..c47986eed 100644 --- a/Xprint/pcl/PclGC.c +++ b/Xprint/pcl/PclGC.c @@ -82,9 +82,6 @@ static GCOps PclGCOps = PclImageGlyphBlt, PclPolyGlyphBlt, PclPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif } ; diff --git a/Xprint/ps/PsGC.c b/Xprint/ps/PsGC.c index 56ff5cdae..61a2a2813 100644 --- a/Xprint/ps/PsGC.c +++ b/Xprint/ps/PsGC.c @@ -107,9 +107,6 @@ static GCOps PsGCOps = PsImageGlyphBlt, PsPolyGlyphBlt, PsPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; diff --git a/afb/afbgc.c b/afb/afbgc.c index 14c95c754..6c46b3b8e 100644 --- a/afb/afbgc.c +++ b/afb/afbgc.c @@ -102,9 +102,6 @@ static GCOps afbGCOps = { afbTEGlyphBlt, afbPolyGlyphBlt, afbPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; diff --git a/cfb/cfbgc.c b/cfb/cfbgc.c index 248b2042a..c20355146 100644 --- a/cfb/cfbgc.c +++ b/cfb/cfbgc.c @@ -141,9 +141,6 @@ GCOps cfbTEOps1Rect = { useTEGlyphBlt, usePolyGlyphBlt, usePushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; GCOps cfbNonTEOps1Rect = { @@ -172,9 +169,6 @@ GCOps cfbNonTEOps1Rect = { useImageGlyphBlt, usePolyGlyphBlt, usePushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; GCOps cfbTEOps = { @@ -198,9 +192,6 @@ GCOps cfbTEOps = { useTEGlyphBlt, usePolyGlyphBlt, usePushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; GCOps cfbNonTEOps = { @@ -228,9 +219,6 @@ GCOps cfbNonTEOps = { useImageGlyphBlt, usePolyGlyphBlt, usePushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; GCOps * diff --git a/exa/exa_accel.c b/exa/exa_accel.c index 0185935d8..bc77a4071 100644 --- a/exa/exa_accel.c +++ b/exa/exa_accel.c @@ -956,9 +956,6 @@ const GCOps exaOps = { exaImageGlyphBlt, ExaCheckPolyGlyphBlt, ExaCheckPushPixels, -#ifdef NEED_LINEHELPER - ,NULL -#endif }; void @@ -21,7 +21,7 @@ * TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XdotOrg: xserver/xorg/fb/fbgc.c,v 1.6 2006/01/18 06:49:17 airlied Exp $ */ +/* $XdotOrg: xserver/xorg/fb/fbgc.c,v 1.7 2006/02/10 22:00:21 anholt Exp $ */ /* $XFree86: xc/programs/Xserver/fb/fbgc.c,v 1.14 2003/12/18 15:22:32 alanh Exp $ */ #ifdef HAVE_DIX_CONFIG_H @@ -63,9 +63,6 @@ const GCOps fbGCOps = { fbImageGlyphBlt, fbPolyGlyphBlt, fbPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; Bool diff --git a/fb/fbpseudocolor.c b/fb/fbpseudocolor.c index 3e7b49cc6..2233f95dc 100644 --- a/fb/fbpseudocolor.c +++ b/fb/fbpseudocolor.c @@ -1211,9 +1211,6 @@ GCOps xxGCOps = { xxPolyText16, xxImageText8, xxImageText16, xxImageGlyphBlt, xxPolyGlyphBlt, xxPushPixels, -#ifdef NEED_LINEHELPER - NULL, -#endif {NULL} /* devPrivate */ }; diff --git a/hw/kdrive/igs/igsdraw.c b/hw/kdrive/igs/igsdraw.c index 46c98cfc7..1ae11a571 100644 --- a/hw/kdrive/igs/igsdraw.c +++ b/hw/kdrive/igs/igsdraw.c @@ -1306,9 +1306,6 @@ static const GCOps igsOps = { igsImageGlyphBlt, igsPolyGlyphBlt, igsPushPixels, -#ifdef NEED_LINEHELPER - ,NULL -#endif }; void diff --git a/hw/kdrive/savage/s3draw.c b/hw/kdrive/savage/s3draw.c index c22398fd2..cda9be7fd 100644 --- a/hw/kdrive/savage/s3draw.c +++ b/hw/kdrive/savage/s3draw.c @@ -2969,9 +2969,6 @@ static const GCOps s3_24GCOps = { s3_24ImageGlyphBlt, KdCheckPolyGlyphBlt, KdCheckPushPixels, -#ifdef NEED_LINEHELPER - ,NULL -#endif }; void diff --git a/hw/kdrive/savage/s3gc.c b/hw/kdrive/savage/s3gc.c index 789ab43d0..a87a2f579 100644 --- a/hw/kdrive/savage/s3gc.c +++ b/hw/kdrive/savage/s3gc.c @@ -72,9 +72,6 @@ static const GCOps s3TEOps = { s3ImageTEGlyphBlt, s3PolyTEGlyphBlt, s3PushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; /* Non TE font */ @@ -99,9 +96,6 @@ static const GCOps s3NonTEOps = { s3ImageGlyphBlt, s3PolyGlyphBlt, s3PushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps * diff --git a/hw/kdrive/sis530/sisdraw.c b/hw/kdrive/sis530/sisdraw.c index 5c7867b25..20671c00a 100644 --- a/hw/kdrive/sis530/sisdraw.c +++ b/hw/kdrive/sis530/sisdraw.c @@ -1475,9 +1475,6 @@ static const GCOps sisOps = { sisImageGlyphBlt, sisPolyGlyphBlt, KdCheckPushPixels, -#ifdef NEED_LINEHELPER - ,NULL -#endif }; void diff --git a/hw/kdrive/src/kaa.c b/hw/kdrive/src/kaa.c index 6c07f2dee..c29e9e9f0 100644 --- a/hw/kdrive/src/kaa.c +++ b/hw/kdrive/src/kaa.c @@ -902,9 +902,6 @@ static const GCOps kaaOps = { kaaImageGlyphBlt, KdCheckPolyGlyphBlt, KdCheckPushPixels, -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static void diff --git a/hw/kdrive/src/kasync.c b/hw/kdrive/src/kasync.c index d57fab757..00d756fc9 100644 --- a/hw/kdrive/src/kasync.c +++ b/hw/kdrive/src/kasync.c @@ -373,9 +373,6 @@ const GCOps kdAsyncPixmapGCOps = { fbImageGlyphBlt, fbPolyGlyphBlt, fbPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; void diff --git a/hw/kdrive/src/knoop.c b/hw/kdrive/src/knoop.c index b358bb374..416e23ef5 100644 --- a/hw/kdrive/src/knoop.c +++ b/hw/kdrive/src/knoop.c @@ -251,7 +251,4 @@ GCOps kdNoopOps = { (typePolyGlyphBlt) NoopDDA, /* glyph blt */ (typeImageGlyphBlt) NoopDDA, /* iglyph blt */ (typePushPixels) NoopDDA, /* push pixels */ -#ifdef NEED_LINEHELPER - (typeLineHelper) NULL, -#endif }; diff --git a/hw/xfree86/rac/xf86RAC.c b/hw/xfree86/rac/xf86RAC.c index 05ea7ac7d..1f2d3a129 100644 --- a/hw/xfree86/rac/xf86RAC.c +++ b/hw/xfree86/rac/xf86RAC.c @@ -254,9 +254,6 @@ GCOps RACGCOps = { RACPolyRectangle, RACPolyArc, RACFillPolygon, RACPolyFillRect, RACPolyFillArc, RACPolyText8, RACPolyText16, RACImageText8, RACImageText16, RACImageGlyphBlt, RACPolyGlyphBlt, RACPushPixels, -#ifdef NEED_LINEHELPER - NULL, -#endif {NULL} /* devPrivate */ }; diff --git a/hw/xfree86/shadowfb/shadow.c b/hw/xfree86/shadowfb/shadow.c index 7da9617cb..cea2571b3 100644 --- a/hw/xfree86/shadowfb/shadow.c +++ b/hw/xfree86/shadowfb/shadow.c @@ -1830,9 +1830,6 @@ GCOps ShadowGCOps = { ShadowPolyText16, ShadowImageText8, ShadowImageText16, ShadowImageGlyphBlt, ShadowPolyGlyphBlt, ShadowPushPixels, -#ifdef NEED_LINEHELPER - NULL, -#endif {NULL} /* devPrivate */ }; diff --git a/hw/xfree86/xaa/xaaFallback.c b/hw/xfree86/xaa/xaaFallback.c index da7a38ea9..111bd45e3 100644 --- a/hw/xfree86/xaa/xaaFallback.c +++ b/hw/xfree86/xaa/xaaFallback.c @@ -344,9 +344,6 @@ GCOps XAAFallbackOps = { XAAPolyText16Fallback, XAAImageText8Fallback, XAAImageText16Fallback, XAAImageGlyphBltFallback, XAAPolyGlyphBltFallback, XAAPushPixelsFallback, -#ifdef NEED_LINEHELPER - NULL, -#endif {NULL} /* devPrivate */ }; diff --git a/hw/xfree86/xaa/xaaGC.c b/hw/xfree86/xaa/xaaGC.c index 31f084e7e..ab46e9b4b 100644 --- a/hw/xfree86/xaa/xaaGC.c +++ b/hw/xfree86/xaa/xaaGC.c @@ -651,8 +651,5 @@ GCOps XAAPixmapOps = { XAAPolyText16Pixmap, XAAImageText8Pixmap, XAAImageText16Pixmap, XAAImageGlyphBltPixmap, XAAPolyGlyphBltPixmap, XAAPushPixelsPixmap, -#ifdef NEED_LINEHELPER - NULL, -#endif {NULL} /* devPrivate */ }; diff --git a/hw/xfree86/xf4bpp/ppcGC.c b/hw/xfree86/xf4bpp/ppcGC.c index 6197fc6af..1a2de42f3 100644 --- a/hw/xfree86/xf4bpp/ppcGC.c +++ b/hw/xfree86/xf4bpp/ppcGC.c @@ -146,9 +146,6 @@ static GCOps vgaGCOps = { xf4bppImageGlyphBlt, /* GJA -- void (* ImageGlyphBlt)() */ miPolyGlyphBlt, /* GJA -- void (* PolyGlyphBlt)() */ miPushPixels, /* void (* PushPixels)() */ -#ifdef NEED_LINEHELPER - miMiter, /* void (* LineHelper)() */ -#endif {NULL} /* devPrivate */ }; @@ -244,10 +241,6 @@ while ((idx = LOWBIT(changes))) { break ; case GCJoinStyle: -#ifdef NEED_LINEHELPER - pGC->ops->LineHelper = ( pGC->joinStyle == JoinMiter ) - ? miMiter : miNotMiter ; -#endif changes &= ~ idx ; /* i.e. changes &= ~ GCJoinStyle */ break ; diff --git a/hw/xfree86/xf4bpp/vgaGC.c b/hw/xfree86/xf4bpp/vgaGC.c index f7a3d9440..64b4dae48 100644 --- a/hw/xfree86/xf4bpp/vgaGC.c +++ b/hw/xfree86/xf4bpp/vgaGC.c @@ -159,10 +159,6 @@ register unsigned long int idx ; /* used for stepping through bitfields */ changes &= ~( GCLineStyle | GCLineWidth ) ; break ; case GCJoinStyle: -#ifdef NEED_LINEHELPER - pGC->ops->LineHelper = - ( pGC->joinStyle == JoinMiter ) ? miMiter : miNotMiter ; -#endif /* * If these are just square boxes with no funny business * going on we can call the fast routine that draws diff --git a/hw/xfree86/xf8_32bpp/cfbgc.c b/hw/xfree86/xf8_32bpp/cfbgc.c index d340e8c53..0ffafd048 100644 --- a/hw/xfree86/xf8_32bpp/cfbgc.c +++ b/hw/xfree86/xf8_32bpp/cfbgc.c @@ -144,9 +144,6 @@ static GCOps cfb8_32TEOps1Rect = { useTEGlyphBlt, usePolyGlyphBlt, usePushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps cfb8_32NonTEOps1Rect = { @@ -175,9 +172,6 @@ static GCOps cfb8_32NonTEOps1Rect = { useImageGlyphBlt, usePolyGlyphBlt, usePushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps cfb8_32TEOps = { @@ -201,9 +195,6 @@ static GCOps cfb8_32TEOps = { useTEGlyphBlt, usePolyGlyphBlt, usePushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps cfb8_32NonTEOps = { @@ -231,9 +222,6 @@ static GCOps cfb8_32NonTEOps = { useImageGlyphBlt, usePolyGlyphBlt, usePushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps * diff --git a/hw/xfree86/xf8_32bpp/cfbgcunder.c b/hw/xfree86/xf8_32bpp/cfbgcunder.c index 79176c86a..3f45a85d1 100644 --- a/hw/xfree86/xf8_32bpp/cfbgcunder.c +++ b/hw/xfree86/xf8_32bpp/cfbgcunder.c @@ -125,9 +125,6 @@ static GCOps cfbTEOps1Rect = { useTEGlyphBlt, usePolyGlyphBlt, usePushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps cfbNonTEOps1Rect = { @@ -156,9 +153,6 @@ static GCOps cfbNonTEOps1Rect = { useImageGlyphBlt, usePolyGlyphBlt, usePushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps cfbTEOps = { @@ -182,9 +176,6 @@ static GCOps cfbTEOps = { useTEGlyphBlt, usePolyGlyphBlt, usePushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps cfbNonTEOps = { @@ -212,9 +203,6 @@ static GCOps cfbNonTEOps = { useImageGlyphBlt, usePolyGlyphBlt, usePushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps * diff --git a/hw/xfree86/xf8_32bpp/xf86overlay.c b/hw/xfree86/xf8_32bpp/xf86overlay.c index c02e9b5d4..2316db05f 100644 --- a/hw/xfree86/xf8_32bpp/xf86overlay.c +++ b/hw/xfree86/xf8_32bpp/xf86overlay.c @@ -101,9 +101,6 @@ static GCOps PixmapGCOps = { PixmapPolyText16, PixmapImageText8, PixmapImageText16, PixmapImageGlyphBlt, PixmapPolyGlyphBlt, PixmapPushPixels, -#ifdef NEED_LINEHELPER - NULL, -#endif {NULL} /* devPrivate */ }; @@ -152,9 +149,6 @@ static GCOps WindowGCOps = { WindowPolyText16, WindowImageText8, WindowImageText16, WindowImageGlyphBlt, WindowPolyGlyphBlt, WindowPushPixels, -#ifdef NEED_LINEHELPER - NULL, -#endif {NULL} /* devPrivate */ }; diff --git a/hw/xgl/xglgc.c b/hw/xgl/xglgc.c index deb3982a5..7e7e75134 100644 --- a/hw/xgl/xglgc.c +++ b/hw/xgl/xglgc.c @@ -85,9 +85,6 @@ static const GCOps xglGCOps = { xglImageGlyphBlt, xglPolyGlyphBlt, xglPushPixels -#ifdef NEED_LINEHELPER - , NULL -#endif }; void diff --git a/hw/xwin/wingc.c b/hw/xwin/wingc.c index 3f661d520..107d87aef 100644 --- a/hw/xwin/wingc.c +++ b/hw/xwin/wingc.c @@ -120,9 +120,6 @@ const GCOps winGCOps = { miPolyGlyphBlt, #endif winPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; diff --git a/include/gcstruct.h b/include/gcstruct.h index c2226ba17..1d0072674 100644 --- a/include/gcstruct.h +++ b/include/gcstruct.h @@ -264,10 +264,6 @@ typedef struct _GCOps { int /*x*/, int /*y*/); -#ifdef NEED_LINEHELPER - void (* LineHelper)(); -#endif - DevUnion devPrivate; } GCOps; diff --git a/mfb/mfbgc.c b/mfb/mfbgc.c index b248a1caf..dd20a9a36 100644 --- a/mfb/mfbgc.c +++ b/mfb/mfbgc.c @@ -101,9 +101,6 @@ static GCOps whiteTECopyOps = { mfbTEGlyphBltWhite, mfbPolyGlyphBltWhite, mfbSolidPP -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps blackTECopyOps = { @@ -127,9 +124,6 @@ static GCOps blackTECopyOps = { mfbTEGlyphBltBlack, mfbPolyGlyphBltBlack, mfbSolidPP -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps whiteTEInvertOps = { @@ -153,9 +147,6 @@ static GCOps whiteTEInvertOps = { mfbTEGlyphBltWhite, mfbPolyGlyphBltInvert, mfbSolidPP -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps blackTEInvertOps = { @@ -179,9 +170,6 @@ static GCOps blackTEInvertOps = { mfbTEGlyphBltBlack, mfbPolyGlyphBltInvert, mfbSolidPP -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps whiteCopyOps = { @@ -205,9 +193,6 @@ static GCOps whiteCopyOps = { mfbImageGlyphBltWhite, mfbPolyGlyphBltWhite, mfbSolidPP -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps blackCopyOps = { @@ -231,9 +216,6 @@ static GCOps blackCopyOps = { mfbImageGlyphBltBlack, mfbPolyGlyphBltBlack, mfbSolidPP -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps whiteInvertOps = { @@ -257,9 +239,6 @@ static GCOps whiteInvertOps = { mfbImageGlyphBltWhite, mfbPolyGlyphBltInvert, mfbSolidPP -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps blackInvertOps = { @@ -283,9 +262,6 @@ static GCOps blackInvertOps = { mfbImageGlyphBltBlack, mfbPolyGlyphBltInvert, mfbSolidPP -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps whiteWhiteCopyOps = { @@ -309,9 +285,6 @@ static GCOps whiteWhiteCopyOps = { miImageGlyphBlt, mfbPolyGlyphBltWhite, mfbSolidPP -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps blackBlackCopyOps = { @@ -335,9 +308,6 @@ static GCOps blackBlackCopyOps = { miImageGlyphBlt, mfbPolyGlyphBltBlack, mfbSolidPP -#ifdef NEED_LINEHELPER - ,NULL -#endif }; static GCOps fgEqBgInvertOps = { @@ -361,9 +331,6 @@ static GCOps fgEqBgInvertOps = { miImageGlyphBlt, mfbPolyGlyphBltInvert, mfbSolidPP -#ifdef NEED_LINEHELPER - ,NULL -#endif }; @@ -517,14 +517,6 @@ extern void miWideDash( DDXPointPtr /*pPts*/ ); -extern void miMiter( - void -); - -extern void miNotMiter( - void -); - /* miwindow.c */ extern void miClearToBackground( diff --git a/mi/mibank.c b/mi/mibank.c index 2ca8f4782..d7cf94b49 100644 --- a/mi/mibank.c +++ b/mi/mibank.c @@ -1364,9 +1364,6 @@ static GCOps miBankGCOps = miBankImageGlyphBlt, miBankPolyGlyphBlt, miBankPushPixels, -#ifdef NEED_LINEHELPER - NULL, /* LineHelper */ -#endif {NULL} /* devPrivate */ }; diff --git a/mi/mibstore.c b/mi/mibstore.c index 99985f24a..b13ab4fc1 100644 --- a/mi/mibstore.c +++ b/mi/mibstore.c @@ -293,9 +293,6 @@ static void miBSPolyGlyphBlt(DrawablePtr pDrawable, GCPtr pGC, static void miBSPushPixels(GCPtr pGC, PixmapPtr pBitMap, DrawablePtr pDst, int w, int h, int x, int y); -#ifdef NEED_LINEHELPER -static void miBSLineHelper(void); -#endif static GCOps miBSGCOps = { miBSFillSpans, miBSSetSpans, miBSPutImage, @@ -305,9 +302,6 @@ static GCOps miBSGCOps = { miBSPolyFillArc, miBSPolyText8, miBSPolyText16, miBSImageText8, miBSImageText16, miBSImageGlyphBlt, miBSPolyGlyphBlt, miBSPushPixels -#ifdef NEED_LINEHELPER - , miBSLineHelper -#endif }; #define FUNC_PROLOGUE(pGC, pPriv) \ @@ -2235,24 +2229,6 @@ miBSPushPixels(pGC, pBitMap, pDst, w, h, x, y) EPILOGUE (pGC); } -#ifdef NEED_LINEHELPER -/*- - *----------------------------------------------------------------------- - * miBSLineHelper -- - * - * Results: should never be called - * - * Side Effects: server dies - * - *----------------------------------------------------------------------- - */ -static void -miBSLineHelper() -{ - FatalError("miBSLineHelper called\n"); -} -#endif - /*- *----------------------------------------------------------------------- * miBSClearBackingStore -- diff --git a/mi/miwideline.c b/mi/miwideline.c index 0630580fe..33170a305 100644 --- a/mi/miwideline.c +++ b/mi/miwideline.c @@ -2231,15 +2231,3 @@ miWideDash (pDrawable, pGC, mode, npt, pPts) if (spanData) miCleanupSpanData (pDrawable, pGC, spanData); } - -/* these are stubs to allow old ddx ValidateGCs to work without change */ - -void -miMiter() -{ -} - -void -miNotMiter() -{ -} diff --git a/miext/damage/damage.c b/miext/damage/damage.c index 54f168039..ef7bca455 100755 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -1637,9 +1637,6 @@ GCOps damageGCOps = { damagePolyText16, damageImageText8, damageImageText16, damageImageGlyphBlt, damagePolyGlyphBlt, damagePushPixels, -#ifdef NEED_LINEHELPER - NULL, -#endif {NULL} /* devPrivate */ }; diff --git a/miext/rootless/accel/rlAccel.c b/miext/rootless/accel/rlAccel.c index 188fd4872..4c780f526 100644 --- a/miext/rootless/accel/rlAccel.c +++ b/miext/rootless/accel/rlAccel.c @@ -26,7 +26,7 @@ * holders shall not be used in advertising or otherwise to promote the sale, * use or other dealings in this Software without prior written authorization. */ -/* $XdotOrg: xc/programs/Xserver/miext/rootless/accel/rlAccel.c,v 1.3 2004/12/09 22:40:35 torrey Exp $ */ +/* $XdotOrg: xserver/xorg/miext/rootless/accel/rlAccel.c,v 1.5 2005/07/03 07:02:03 daniels Exp $ */ /* * The accelerated rootless code replaces some GC operations from fb with @@ -74,9 +74,6 @@ static GCOps rlAccelOps = { rlImageGlyphBlt, fbPolyGlyphBlt, fbPushPixels -#ifdef NEED_LINEHELPER - ,NULL -#endif }; diff --git a/miext/rootless/rootlessGC.c b/miext/rootless/rootlessGC.c index 61987addb..32ffbf13b 100644 --- a/miext/rootless/rootlessGC.c +++ b/miext/rootless/rootlessGC.c @@ -114,9 +114,6 @@ static GCOps rootlessGCOps = { RootlessImageGlyphBlt, RootlessPolyGlyphBlt, RootlessPushPixels -#ifdef NEED_LINEHELPER - , NULL -#endif }; /* |