diff options
Diffstat (limited to 'fb')
| -rw-r--r-- | fb/fb.h | 6 | ||||
| -rw-r--r-- | fb/fballpriv.c | 2 | ||||
| -rw-r--r-- | fb/fbscreen.c | 4 | ||||
| -rw-r--r-- | fb/fbwindow.c | 2 |
4 files changed, 0 insertions, 14 deletions
@@ -597,9 +597,7 @@ extern void fbSetBits (FbStip *bits, int stride, FbStip data); } extern DevPrivateKey fbGetGCPrivateKey(void); -#ifndef FB_NO_WINDOW_PIXMAPS extern DevPrivateKey fbGetWinPrivateKey(void); -#endif extern const GCOps fbGCOps; extern const GCFuncs fbGCFuncs; @@ -670,12 +668,8 @@ typedef struct { #define fbGetRotatedPixmap(pGC) ((pGC)->pRotatedPixmap) #define fbGetScreenPixmap(s) ((PixmapPtr) (s)->devPrivate) -#ifdef FB_NO_WINDOW_PIXMAPS -#define fbGetWindowPixmap(d) fbGetScreenPixmap(((DrawablePtr) (d))->pScreen) -#else #define fbGetWindowPixmap(pWin) ((PixmapPtr)\ dixLookupPrivate(&((WindowPtr)(pWin))->devPrivates, fbGetWinPrivateKey())) -#endif #ifdef ROOTLESS #define __fbPixDrawableX(pPix) ((pPix)->drawable.x) diff --git a/fb/fballpriv.c b/fb/fballpriv.c index 68cb2e4c0..2e77289bb 100644 --- a/fb/fballpriv.c +++ b/fb/fballpriv.c @@ -38,13 +38,11 @@ DevPrivateKey fbGetGCPrivateKey(void) { return fbGCPrivateKey; } -#ifndef FB_NO_WINDOW_PIXMAPS static DevPrivateKey fbWinPrivateKey = &fbWinPrivateKey; DevPrivateKey fbGetWinPrivateKey(void) { return fbWinPrivateKey; } -#endif Bool fbAllocatePrivates(ScreenPtr pScreen, DevPrivateKey *pGCKey) diff --git a/fb/fbscreen.c b/fb/fbscreen.c index 12b19e419..ea2491211 100644 --- a/fb/fbscreen.c +++ b/fb/fbscreen.c @@ -90,11 +90,7 @@ _fbGetWindowPixmap (WindowPtr pWindow) void _fbSetWindowPixmap (WindowPtr pWindow, PixmapPtr pPixmap) { -#ifdef FB_NO_WINDOW_PIXMAPS - FatalError ("Attempted to set window pixmap without fb support\n"); -#else dixSetPrivate(&pWindow->devPrivates, fbGetWinPrivateKey(), pPixmap); -#endif } Bool diff --git a/fb/fbwindow.c b/fb/fbwindow.c index 9bde92769..70e75a9e9 100644 --- a/fb/fbwindow.c +++ b/fb/fbwindow.c @@ -31,10 +31,8 @@ Bool fbCreateWindow(WindowPtr pWin) { -#ifndef FB_NO_WINDOW_PIXMAPS dixSetPrivate(&pWin->devPrivates, fbGetWinPrivateKey(), fbGetScreenPixmap(pWin->drawable.pScreen)); -#endif #ifdef FB_SCREEN_PRIVATE if (pWin->drawable.bitsPerPixel == 32) pWin->drawable.bitsPerPixel = fbGetScreenPrivate(pWin->drawable.pScreen)->win32bpp; |