diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-03-29 14:27:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-04-01 10:28:06 +1000 |
| commit | be9cfb249da18d134c1d65bbb75161aff65f2942 (patch) | |
| tree | 6dbbadeaeed6ce53a5308c0da8b6353940face20 /fb/fbseg.c | |
| parent | e0a2ad51dfb7373aa602335490d9666d6101b5ea (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/fbseg.c')
| -rw-r--r-- | fb/fbseg.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/fb/fbseg.c b/fb/fbseg.c index 7cc38a20c..5a458fe51 100644 --- a/fb/fbseg.c +++ b/fb/fbseg.c @@ -330,7 +330,6 @@ fbBresFillDash (DrawablePtr pDrawable, fbSetFg (pDrawable, pGC, fg); } -#ifdef FB_24BIT static void fbBresSolid24RRop (DrawablePtr pDrawable, GCPtr pGC, @@ -507,7 +506,6 @@ fbBresDash24RRop (DrawablePtr pDrawable, fbFinishAccess (pDrawable); } -#endif /* * For drivers that want to bail drawing some lines, this @@ -529,23 +527,17 @@ fbSelectBres (DrawablePtr pDrawable, if (pGC->fillStyle == FillSolid) { bres = fbBresSolid; -#ifdef FB_24BIT if (dstBpp == 24) bres = fbBresSolid24RRop; -#endif -#ifndef FBNOPIXADDR if (pPriv->and == 0) { switch (dstBpp) { case 8: bres = fbBresSolid8; break; case 16: bres = fbBresSolid16; break; -#ifdef FB_24BIT case 24: bres = fbBresSolid24; break; -#endif case 32: bres = fbBresSolid32; break; } } -#endif } } else @@ -554,24 +546,18 @@ fbSelectBres (DrawablePtr pDrawable, if (pGC->fillStyle == FillSolid) { bres = fbBresDash; -#ifdef FB_24BIT if (dstBpp == 24) bres = fbBresDash24RRop; -#endif -#ifndef FBNOPIXADDR if (pPriv->and == 0 && (pGC->lineStyle == LineOnOffDash || pPriv->bgand == 0)) { switch (dstBpp) { case 8: bres = fbBresDash8; break; case 16: bres = fbBresDash16; break; -#ifdef FB_24BIT case 24: bres = fbBresDash24; break; -#endif case 32: bres = fbBresDash32; break; } } -#endif } } return bres; |