summaryrefslogtreecommitdiff
path: root/hw
diff options
context:
space:
mode:
authorAdam Jackson <ajax@nwnk.net>2006-04-30 19:16:14 +0000
committerAdam Jackson <ajax@nwnk.net>2006-04-30 19:16:14 +0000
commit291e89d4f2a4bb3177b2dfe6421680e23f120b8e (patch)
tree7bc1818c4774751696b1d0cc3b568c883c2184a8 /hw
parentfdcacc5a4bc1d6cb7347fc66041a9c686c5c74d1 (diff)
Remove NEED_LINEHELPER BC cruft for pre-R6 DDXes.
Diffstat (limited to 'hw')
-rw-r--r--hw/kdrive/igs/igsdraw.c3
-rw-r--r--hw/kdrive/savage/s3draw.c3
-rw-r--r--hw/kdrive/savage/s3gc.c6
-rw-r--r--hw/kdrive/sis530/sisdraw.c3
-rw-r--r--hw/kdrive/src/kaa.c3
-rw-r--r--hw/kdrive/src/kasync.c3
-rw-r--r--hw/kdrive/src/knoop.c3
-rw-r--r--hw/xfree86/rac/xf86RAC.c3
-rw-r--r--hw/xfree86/shadowfb/shadow.c3
-rw-r--r--hw/xfree86/xaa/xaaFallback.c3
-rw-r--r--hw/xfree86/xaa/xaaGC.c3
-rw-r--r--hw/xfree86/xf4bpp/ppcGC.c7
-rw-r--r--hw/xfree86/xf4bpp/vgaGC.c4
-rw-r--r--hw/xfree86/xf8_32bpp/cfbgc.c12
-rw-r--r--hw/xfree86/xf8_32bpp/cfbgcunder.c12
-rw-r--r--hw/xfree86/xf8_32bpp/xf86overlay.c6
-rw-r--r--hw/xgl/xglgc.c3
-rw-r--r--hw/xwin/wingc.c3
18 files changed, 0 insertions, 83 deletions
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
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-28 08:45:06 +0000