diff options
| author | marha <marha@users.sourceforge.net> | 2011-04-01 12:04:34 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-04-01 12:04:34 +0000 |
| commit | 0fd309bfed8f9f61a8ea8bbbe7628d0af471c070 (patch) | |
| tree | 97a335ffb903e9cf159322f3906f9cb71d660d9c /xorg-server/fb/fbseg.c | |
| parent | dab40e0df33e80dab53b4ca20760c1fb4388649b (diff) | |
| parent | 5d8e1ad0cd01de0bd0b43dc916c1d39fd293e79d (diff) | |
| download | vcxsrv-0fd309bfed8f9f61a8ea8bbbe7628d0af471c070.tar.gz vcxsrv-0fd309bfed8f9f61a8ea8bbbe7628d0af471c070.tar.bz2 vcxsrv-0fd309bfed8f9f61a8ea8bbbe7628d0af471c070.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/fb/fbseg.c')
| -rw-r--r-- | xorg-server/fb/fbseg.c | 14 |
1 files changed, 0 insertions, 14 deletions
diff --git a/xorg-server/fb/fbseg.c b/xorg-server/fb/fbseg.c index 8a68857f7..4885bd87f 100644 --- a/xorg-server/fb/fbseg.c +++ b/xorg-server/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;
|