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>
This commit is contained in:
14
fb/fbseg.c
14
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;
|
||||
|
||||
Reference in New Issue
Block a user