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/fbpoint.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/fbpoint.c')
| -rw-r--r-- | xorg-server/fb/fbpoint.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/xorg-server/fb/fbpoint.c b/xorg-server/fb/fbpoint.c index d675dbaff..f7db7e231 100644 --- a/xorg-server/fb/fbpoint.c +++ b/xorg-server/fb/fbpoint.c @@ -75,7 +75,6 @@ fbDots (FbBits *dstOrig, x = (x + xoff) * dstBpp;
d = dst + ((y + yoff) * dstStride) + (x >> FB_STIP_SHIFT);
x &= FB_STIP_MASK;
-#ifdef FB_24BIT
if (dstBpp == 24)
{
FbStip leftMask, rightMask;
@@ -97,7 +96,6 @@ fbDots (FbBits *dstOrig, WRITE(d, FbDoMaskRRop(READ(d), andT, xorT, rightMask));
}
else
-#endif
{
FbStip mask;
mask = FbStipMask(x, dstBpp);
@@ -144,16 +142,12 @@ fbPolyPoint (DrawablePtr pDrawable, and = pPriv->and;
xor = pPriv->xor;
dots = fbDots;
-#ifndef FBNOPIXADDR
switch (dstBpp) {
case 8: dots = fbDots8; break;
case 16: dots = fbDots16; break;
-#ifdef FB_24BIT
case 24: dots = fbDots24; break;
-#endif
case 32: dots = fbDots32; break;
}
-#endif
for (nBox = RegionNumRects (pClip), pBox = RegionRects (pClip);
nBox--; pBox++)
(*dots) (dst, dstStride, dstBpp, pBox, pptInit, nptInit,
|