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/fbwindow.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/fbwindow.c')
| -rw-r--r-- | fb/fbwindow.c | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/fb/fbwindow.c b/fb/fbwindow.c index bb0384d91..d01e6d44d 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -33,10 +33,8 @@ fbCreateWindow(WindowPtr pWin) { dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(), fbGetScreenPixmap(pWin->drawable.pScreen)); -#ifdef FB_SCREEN_PRIVATE if (pWin->drawable.bitsPerPixel == 32) pWin->drawable.bitsPerPixel = fbGetScreenPrivate(pWin->drawable.pScreen)->win32bpp; -#endif return TRUE; } @@ -158,7 +156,6 @@ fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask) if (pWin->backgroundState == BackgroundPixmap) { pPixmap = pWin->background.pixmap; -#ifdef FB_24_32BIT if (pPixmap->drawable.bitsPerPixel != pWin->drawable.bitsPerPixel) { pPixmap = fb24_32ReformatTile (pPixmap, @@ -169,7 +166,6 @@ fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask) pWin->background.pixmap = pPixmap; } } -#endif if (FbEvenTile (pPixmap->drawable.width * pPixmap->drawable.bitsPerPixel)) fbPadPixmap (pPixmap); @@ -180,7 +176,6 @@ fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask) if (pWin->borderIsPixel == FALSE) { pPixmap = pWin->border.pixmap; -#ifdef FB_24_32BIT if (pPixmap->drawable.bitsPerPixel != pWin->drawable.bitsPerPixel) { @@ -192,7 +187,6 @@ fbChangeWindowAttributes(WindowPtr pWin, unsigned long mask) pWin->border.pixmap = pPixmap; } } -#endif if (FbEvenTile (pPixmap->drawable.width * pPixmap->drawable.bitsPerPixel)) fbPadPixmap (pPixmap); |