summaryrefslogtreecommitdiff
path: root/fb/fbline.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-03-29 14:27:41 +1000
committerDave Airlie <airlied@redhat.com>2011-04-01 10:28:06 +1000
commitbe9cfb249da18d134c1d65bbb75161aff65f2942 (patch)
tree6dbbadeaeed6ce53a5308c0da8b6353940face20 /fb/fbline.c
parente0a2ad51dfb7373aa602335490d9666d6101b5ea (diff)
fb: drop defines that aren't used/necessary anymore.
This was generated by: cd fb coan source --replace -DFB_SCREEN_PRIVATE -DFB_24BIT -DFB_24_32BIT -DFB_SCREEN_PRIVATE -UFBNOPIXADDR -UFBNO24BIT -UFBNO24_32 *.[ch] A follow up patch readds the FB_24_32BIT define for Intel UXA. Signed-off-by: Dave Airlie <airlied@redhat.com> Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'fb/fbline.c')
-rw-r--r--fb/fbline.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/fb/fbline.c b/fb/fbline.c
index fa80573e2..e290bf886 100644
--- a/fb/fbline.c
+++ b/fb/fbline.c
@@ -114,7 +114,6 @@ fbPolyLine (DrawablePtr pDrawable,
if (pGC->lineWidth == 0)
{
line = fbZeroLine;
-#ifndef FBNOPIXADDR
if (pGC->fillStyle == FillSolid &&
pGC->lineStyle == LineSolid &&
RegionNumRects (fbGetCompositeClip(pGC)) == 1)
@@ -122,13 +121,10 @@ fbPolyLine (DrawablePtr pDrawable,
switch (pDrawable->bitsPerPixel) {
case 8: line = fbPolyline8; break;
case 16: line = fbPolyline16; break;
-#ifdef FB_24BIT
case 24: line = fbPolyline24; break;
-#endif
case 32: line = fbPolyline32; break;
}
}
-#endif
}
else
{
@@ -151,7 +147,6 @@ fbPolySegment (DrawablePtr pDrawable,
if (pGC->lineWidth == 0)
{
seg = fbZeroSegment;
-#ifndef FBNOPIXADDR
if (pGC->fillStyle == FillSolid &&
pGC->lineStyle == LineSolid &&
RegionNumRects (fbGetCompositeClip(pGC)) == 1)
@@ -159,13 +154,10 @@ fbPolySegment (DrawablePtr pDrawable,
switch (pDrawable->bitsPerPixel) {
case 8: seg = fbPolySegment8; break;
case 16: seg = fbPolySegment16; break;
-#ifdef FB_24BIT
case 24: seg = fbPolySegment24; break;
-#endif
case 32: seg = fbPolySegment32; break;
}
}
-#endif
}
else
{