diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-03-29 14:27:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-04-01 10:28:06 +1000 |
| commit | be9cfb249da18d134c1d65bbb75161aff65f2942 (patch) | |
| tree | 6dbbadeaeed6ce53a5308c0da8b6353940face20 /fb/fbimage.c | |
| parent | e0a2ad51dfb7373aa602335490d9666d6101b5ea (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/fbimage.c')
| -rw-r--r-- | fb/fbimage.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/fb/fbimage.c b/fb/fbimage.c index da1e8bcc4..63978cc3b 100644 --- a/fb/fbimage.c +++ b/fb/fbimage.c @@ -86,7 +86,6 @@ fbPutImage (DrawablePtr pDrawable, } break; case ZPixmap: -#ifdef FB_24_32BIT if (pDrawable->bitsPerPixel != BitsPerPixel(pDrawable->depth)) { srcStride = PixmapBytePad(w, pDrawable->depth); @@ -99,7 +98,6 @@ fbPutImage (DrawablePtr pDrawable, srcStride); } else -#endif { srcStride = PixmapBytePad(w, pDrawable->depth) / sizeof (FbStip); fbPutZImage (pDrawable, @@ -305,14 +303,12 @@ fbGetImage (DrawablePtr pDrawable, if (!fbDrawableEnabled(pDrawable)) return; -#ifdef FB_24_32BIT if (format == ZPixmap && pDrawable->bitsPerPixel != BitsPerPixel (pDrawable->depth)) { fb24_32GetImage (pDrawable, x, y, w, h, format, planeMask, d); return; } -#endif fbGetDrawable (pDrawable, src, srcStride, srcBpp, srcXoff, srcYoff); |