aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/fb/fbblt.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-04-01 07:17:02 +0000
committermarha <marha@users.sourceforge.net>2011-04-01 07:17:02 +0000
commit5d8e1ad0cd01de0bd0b43dc916c1d39fd293e79d (patch)
treeb7092d8d81a5246dd5cec7fa9742e41eaccb69d6 /xorg-server/fb/fbblt.c
parent140242b0d4aed1d595d6565d088d9567c456d6b4 (diff)
downloadvcxsrv-5d8e1ad0cd01de0bd0b43dc916c1d39fd293e79d.tar.gz
vcxsrv-5d8e1ad0cd01de0bd0b43dc916c1d39fd293e79d.tar.bz2
vcxsrv-5d8e1ad0cd01de0bd0b43dc916c1d39fd293e79d.zip
libXext xserver libXmu libX11 libXdmcp xextproto libxtrans mesa git update 1 Apr 2011
Diffstat (limited to 'xorg-server/fb/fbblt.c')
-rw-r--r--xorg-server/fb/fbblt.c8
1 files changed, 0 insertions, 8 deletions
diff --git a/xorg-server/fb/fbblt.c b/xorg-server/fb/fbblt.c
index 38271c0c9..a0402986c 100644
--- a/xorg-server/fb/fbblt.c
+++ b/xorg-server/fb/fbblt.c
@@ -67,14 +67,12 @@ fbBlt (FbBits *srcLine,
int startbyte, endbyte;
FbDeclareMergeRop ();
-#ifdef FB_24BIT
if (bpp == 24 && !FbCheck24Pix (pm))
{
fbBlt24 (srcLine, srcStride, srcX, dstLine, dstStride, dstX,
width, height, alu, pm, reverse, upsidedown);
return;
}
-#endif
if (alu == GXcopy && pm == FB_ALLONES && !reverse &&
!(srcX & 7) && !(dstX & 7) && !(width & 7)) {
@@ -338,7 +336,6 @@ fbBlt (FbBits *srcLine,
}
}
-#ifdef FB_24BIT
#undef DEBUG_BLT24
#ifdef DEBUG_BLT24
@@ -603,7 +600,6 @@ fbBlt24 (FbBits *srcLine,
ErrorF ("\n");
#endif
}
-#endif /* FB_24BIT */
#if FB_SHIFT == FB_STIP_SHIFT + 1
@@ -784,7 +780,6 @@ fbBltOdd (FbBits *srcLine,
}
}
-#ifdef FB_24BIT
void
fbBltOdd24 (FbBits *srcLine,
FbStride srcStrideEven,
@@ -826,7 +821,6 @@ fbBltOdd24 (FbBits *srcLine,
}
}
}
-#endif
#endif
@@ -915,7 +909,6 @@ fbBltStip (FbStip *src,
&dstStrideEven, &dstStrideOdd,
&dstXEven, &dstXOdd);
-#ifdef FB_24BIT
if (bpp == 24 && !FbCheck24Pix (pm))
{
fbBltOdd24 (s, srcStrideEven, srcStrideOdd,
@@ -927,7 +920,6 @@ fbBltStip (FbStip *src,
width, height, alu, pm);
}
else
-#endif
{
fbBltOdd (s, srcStrideEven, srcStrideOdd,
srcXEven, srcXOdd,