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

Remove NEED_LINEHELPER BC cruft for pre-R6 DDXes.

Browse Source
This commit is contained in:
Adam Jackson 2006-04-30 19:16:14 +00:00
parent fdcacc5a4b
commit 291e89d4f2
35 changed files with 40 additions and 208 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
ChangeLog
View File

@ -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),

3
Xprint/pcl/PclGC.c
View File

@ -82,9 +82,6 @@ static GCOps PclGCOps =
PclImageGlyphBlt,
PclPolyGlyphBlt,
PclPushPixels
#ifdef NEED_LINEHELPER
,NULL
#endif
}
;

3
Xprint/ps/PsGC.c
View File

@ -107,9 +107,6 @@ static GCOps PsGCOps =
PsImageGlyphBlt,
PsPolyGlyphBlt,
PsPushPixels
#ifdef NEED_LINEHELPER
,NULL
#endif
};

3
afb/afbgc.c
View File

@ -102,9 +102,6 @@ static GCOps afbGCOps = {
afbTEGlyphBlt,
afbPolyGlyphBlt,
afbPushPixels
#ifdef NEED_LINEHELPER
,NULL
#endif
};

12
cfb/cfbgc.c
View File

@ -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 *

3
exa/exa_accel.c
View File

@ -956,9 +956,6 @@ const GCOps exaOps = {
exaImageGlyphBlt,
ExaCheckPolyGlyphBlt,
ExaCheckPushPixels,
#ifdef NEED_LINEHELPER
,NULL
#endif
};
void

5
fb/fbgc.c
View File

@ -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

3
fb/fbpseudocolor.c
View File

@ -1211,9 +1211,6 @@ GCOps xxGCOps = {
xxPolyText16, xxImageText8,
xxImageText16, xxImageGlyphBlt,
xxPolyGlyphBlt, xxPushPixels,
#ifdef NEED_LINEHELPER
NULL,
#endif
{NULL} /* devPrivate */
};

3
hw/kdrive/igs/igsdraw.c
View File

@ -1306,9 +1306,6 @@ static const GCOps igsOps = {
igsImageGlyphBlt,
igsPolyGlyphBlt,
igsPushPixels,
#ifdef NEED_LINEHELPER
,NULL
#endif
};
void

3
hw/kdrive/savage/s3draw.c
View File

@ -2969,9 +2969,6 @@ static const GCOps s3_24GCOps = {
s3_24ImageGlyphBlt,
KdCheckPolyGlyphBlt,
KdCheckPushPixels,
#ifdef NEED_LINEHELPER
,NULL
#endif
};
void

6
hw/kdrive/savage/s3gc.c
View File

@ -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 *

3
hw/kdrive/sis530/sisdraw.c
View File

@ -1475,9 +1475,6 @@ static const GCOps sisOps = {
sisImageGlyphBlt,
sisPolyGlyphBlt,
KdCheckPushPixels,
#ifdef NEED_LINEHELPER
,NULL
#endif
};
void

3
hw/kdrive/src/kaa.c
View File

@ -902,9 +902,6 @@ static const GCOps kaaOps = {
kaaImageGlyphBlt,
KdCheckPolyGlyphBlt,
KdCheckPushPixels,
#ifdef NEED_LINEHELPER
,NULL
#endif
};
static void

3
hw/kdrive/src/kasync.c
View File

@ -373,9 +373,6 @@ const GCOps kdAsyncPixmapGCOps = {
fbImageGlyphBlt,
fbPolyGlyphBlt,
fbPushPixels
#ifdef NEED_LINEHELPER
,NULL
#endif
};
void

3
hw/kdrive/src/knoop.c
View File

@ -251,7 +251,4 @@ GCOps kdNoopOps = {
(typePolyGlyphBlt) NoopDDA, /* glyph blt */
(typeImageGlyphBlt) NoopDDA, /* iglyph blt */
(typePushPixels) NoopDDA, /* push pixels */
#ifdef NEED_LINEHELPER
(typeLineHelper) NULL,
#endif
};

3
hw/xfree86/rac/xf86RAC.c
View File

@ -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 */
};

3
hw/xfree86/shadowfb/shadow.c
View File

@ -1830,9 +1830,6 @@ GCOps ShadowGCOps = {
ShadowPolyText16, ShadowImageText8,
ShadowImageText16, ShadowImageGlyphBlt,
ShadowPolyGlyphBlt, ShadowPushPixels,
#ifdef NEED_LINEHELPER
NULL,
#endif
{NULL} /* devPrivate */
};

3
hw/xfree86/xaa/xaaFallback.c
View File

@ -344,9 +344,6 @@ GCOps XAAFallbackOps = {
XAAPolyText16Fallback, XAAImageText8Fallback,
XAAImageText16Fallback, XAAImageGlyphBltFallback,
XAAPolyGlyphBltFallback, XAAPushPixelsFallback,
#ifdef NEED_LINEHELPER
NULL,
#endif
{NULL} /* devPrivate */
};

3
hw/xfree86/xaa/xaaGC.c
View File

@ -651,8 +651,5 @@ GCOps XAAPixmapOps = {
XAAPolyText16Pixmap, XAAImageText8Pixmap,
XAAImageText16Pixmap, XAAImageGlyphBltPixmap,
XAAPolyGlyphBltPixmap, XAAPushPixelsPixmap,
#ifdef NEED_LINEHELPER
NULL,
#endif
{NULL} /* devPrivate */
};

7
hw/xfree86/xf4bpp/ppcGC.c
View File

@ -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 ;

4
hw/xfree86/xf4bpp/vgaGC.c
View File

@ -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

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

@ -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 *

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

@ -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 *

6
hw/xfree86/xf8_32bpp/xf86overlay.c
View File

@ -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 */
};

3
hw/xgl/xglgc.c
View File

@ -85,9 +85,6 @@ static const GCOps xglGCOps = {
xglImageGlyphBlt,
xglPolyGlyphBlt,
xglPushPixels
#ifdef NEED_LINEHELPER
, NULL
#endif
};
void

3
hw/xwin/wingc.c
View File

@ -120,9 +120,6 @@ const GCOps winGCOps = {
miPolyGlyphBlt,
#endif
winPushPixels
#ifdef NEED_LINEHELPER
,NULL
#endif
};

4
include/gcstruct.h
View File

@ -264,10 +264,6 @@ typedef struct _GCOps {
int /*x*/,
int /*y*/);
#ifdef NEED_LINEHELPER
void (* LineHelper)();
#endif
DevUnion devPrivate;
} GCOps;

33
mfb/mfbgc.c
View File

@ -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
};

8
mi/mi.h
View File

@ -517,14 +517,6 @@ extern void miWideDash(
DDXPointPtr /*pPts*/
);
extern void miMiter(
void
);
extern void miNotMiter(
void
);
/* miwindow.c */
extern void miClearToBackground(

3
mi/mibank.c
View File

@ -1364,9 +1364,6 @@ static GCOps miBankGCOps =
miBankImageGlyphBlt,
miBankPolyGlyphBlt,
miBankPushPixels,
#ifdef NEED_LINEHELPER
NULL, /* LineHelper */
#endif
{NULL} /* devPrivate */
};

24
mi/mibstore.c
View File

@ -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 --

12
mi/miwideline.c
View File

@ -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()
{
}

3
miext/damage/damage.c
View File

@ -1637,9 +1637,6 @@ GCOps damageGCOps = {
damagePolyText16, damageImageText8,
damageImageText16, damageImageGlyphBlt,
damagePolyGlyphBlt, damagePushPixels,
#ifdef NEED_LINEHELPER
NULL,
#endif
{NULL} /* devPrivate */
};

5
miext/rootless/accel/rlAccel.c
View File

@ -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
};

3
miext/rootless/rootlessGC.c
View File

@ -114,9 +114,6 @@ static GCOps rootlessGCOps = {
RootlessImageGlyphBlt,
RootlessPolyGlyphBlt,
RootlessPushPixels
#ifdef NEED_LINEHELPER
, NULL
#endif
};
/*