summaryrefslogtreecommitdiff
path: root/fb/fbsolid.c
diff options
context:
space:
mode:
authorDave Airlie <airlied@redhat.com>2011-03-29 14:27:41 +1000
committerDave Airlie <airlied@redhat.com>2011-04-01 10:28:06 +1000
commitbe9cfb249da18d134c1d65bbb75161aff65f2942 (patch)
tree6dbbadeaeed6ce53a5308c0da8b6353940face20 /fb/fbsolid.c
parente0a2ad51dfb7373aa602335490d9666d6101b5ea (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/fbsolid.c')
-rw-r--r--fb/fbsolid.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/fb/fbsolid.c b/fb/fbsolid.c
index 53fcae071..414378531 100644
--- a/fb/fbsolid.c
+++ b/fb/fbsolid.c
@@ -44,13 +44,11 @@ fbSolid (FbBits *dst,
int n, nmiddle;
int startbyte, endbyte;
-#ifdef FB_24BIT
if (bpp == 24 && (!FbCheck24Pix(and) || !FbCheck24Pix(xor)))
{
fbSolid24 (dst, dstStride, dstX, width, height, and, xor);
return;
}
-#endif
dst += dstX >> FB_SHIFT;
dstX &= FB_MASK;
FbMaskBitsBytes(dstX, width, and == 0, startmask, startbyte,
@@ -81,7 +79,6 @@ fbSolid (FbBits *dst,
}
}
-#ifdef FB_24BIT
void
fbSolid24 (FbBits *dst,
FbStride dstStride,
@@ -210,4 +207,3 @@ fbSolid24 (FbBits *dst,
dst += dstStride;
}
}
-#endif