diff options
Diffstat (limited to 'hw/xfree86')
-rw-r--r-- | hw/xfree86/rac/xf86RAC.c | 3 | ||||
-rw-r--r-- | hw/xfree86/shadowfb/shadow.c | 3 | ||||
-rw-r--r-- | hw/xfree86/xaa/xaaFallback.c | 3 | ||||
-rw-r--r-- | hw/xfree86/xaa/xaaGC.c | 3 | ||||
-rw-r--r-- | hw/xfree86/xf4bpp/ppcGC.c | 7 | ||||
-rw-r--r-- | hw/xfree86/xf4bpp/vgaGC.c | 4 | ||||
-rw-r--r-- | hw/xfree86/xf8_32bpp/cfbgc.c | 12 | ||||
-rw-r--r-- | hw/xfree86/xf8_32bpp/cfbgcunder.c | 12 | ||||
-rw-r--r-- | hw/xfree86/xf8_32bpp/xf86overlay.c | 6 |
9 files changed, 0 insertions, 53 deletions
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 */ }; |