fb: overlay: drop unused fbOverlaySetupScreen()

Not used anywhere, neither internal nor drivers, so no need to keep
it around any longer.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>

fb/fboverlay.c

@@ -46,7 +46,7 @@ fbOverlayGetScreenPrivateKey(void)
  * Replace this if you want something supporting
  * multiple overlays with the same depth
  */
-Bool
+static Bool
 fbOverlayCreateWindow(WindowPtr pWin)
 {
     FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen);
@@ -76,7 +76,7 @@ fbOverlayCreateWindow(WindowPtr pWin)
     return FALSE;
 }
 
-Bool
+static Bool
 fbOverlayCloseScreen(ScreenPtr pScreen)
 {
     FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen);
@@ -92,7 +92,7 @@ fbOverlayCloseScreen(ScreenPtr pScreen)
 /*
  * Return layer containing this window
  */
-int
+static int
 fbOverlayWindowLayer(WindowPtr pWin)
 {
     FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pWin->drawable.pScreen);
@@ -105,7 +105,7 @@ fbOverlayWindowLayer(WindowPtr pWin)
     return 0;
 }
 
-Bool
+static Bool
 fbOverlayCreateScreenResources(ScreenPtr pScreen)
 {
     int i;
@@ -143,7 +143,7 @@ fbOverlayCreateScreenResources(ScreenPtr pScreen)
     return TRUE;
 }
 
-void
+static void
 fbOverlayPaintKey(DrawablePtr pDrawable,
                   RegionPtr pRegion, CARD32 pixel, int layer)
 {
@@ -154,7 +154,7 @@ fbOverlayPaintKey(DrawablePtr pDrawable,
 /*
  * Track visible region for each layer
  */
-void
+static void
 fbOverlayUpdateLayerRegion(ScreenPtr pScreen, int layer, RegionPtr prgn)
 {
     FbOverlayScrPrivPtr pScrPriv = fbOverlayGetScrPriv(pScreen);
@@ -186,7 +186,7 @@ fbOverlayUpdateLayerRegion(ScreenPtr pScreen, int layer, RegionPtr prgn)
 /*
  * Copy only areas in each layer containing real bits
  */
-void
+static void
 fbOverlayCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
 {
     ScreenPtr pScreen = pWin->drawable.pScreen;
@@ -235,7 +235,7 @@ fbOverlayCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc)
     RegionUninit(&rgnDst);
 }
 
-void
+static void
 fbOverlayWindowExposures(WindowPtr pWin, RegionPtr prgn)
 {
     fbOverlayUpdateLayerRegion(pWin->drawable.pScreen,
@@ -243,19 +243,6 @@ fbOverlayWindowExposures(WindowPtr pWin, RegionPtr prgn)
     miWindowExposures(pWin, prgn);
 }
 
-Bool
-fbOverlaySetupScreen(ScreenPtr pScreen,
-                     void *pbits1,
-                     void *pbits2,
-                     int xsize,
-                     int ysize,
-                     int dpix,
-                     int dpiy, int width1, int width2, int bpp1, int bpp2)
-{
-    return fbSetupScreen(pScreen,
-                         pbits1, xsize, ysize, dpix, dpiy, width1, bpp1);
-}
-
 Bool
 fbOverlayFinishScreenInit(ScreenPtr pScreen,
                           void *pbits1,

fb/fboverlay.h

@@ -59,40 +59,6 @@ typedef struct _fbOverlayScrPriv {
 
 #define fbOverlayGetScrPriv(s) \
     dixLookupPrivate(&(s)->devPrivates, fbOverlayGetScreenPrivateKey())
-extern _X_EXPORT Bool
- fbOverlayCreateWindow(WindowPtr pWin);
-
-extern _X_EXPORT Bool
- fbOverlayCloseScreen(ScreenPtr pScreen);
-
-extern _X_EXPORT int
- fbOverlayWindowLayer(WindowPtr pWin);
-
-extern _X_EXPORT Bool
- fbOverlayCreateScreenResources(ScreenPtr pScreen);
-
-extern _X_EXPORT void
-
-fbOverlayPaintKey(DrawablePtr pDrawable,
-                  RegionPtr pRegion, CARD32 pixel, int layer);
-extern _X_EXPORT void
- fbOverlayUpdateLayerRegion(ScreenPtr pScreen, int layer, RegionPtr prgn);
-
-extern _X_EXPORT void
- fbOverlayCopyWindow(WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr prgnSrc);
-
-extern _X_EXPORT void
-fbOverlayWindowExposures(WindowPtr pWin, RegionPtr prgn);
-
-extern _X_EXPORT Bool
-
-fbOverlaySetupScreen(ScreenPtr pScreen,
-                     void *pbits1,
-                     void *pbits2,
-                     int xsize,
-                     int ysize,
-                     int dpix,
-                     int dpiy, int width1, int width2, int bpp1, int bpp2);
 
 extern _X_EXPORT Bool
 

fb/wfbrename.h

@@ -68,18 +68,9 @@
 #define FbMergeRopBits wFbMergeRopBits
 #define fbOddTile wfbOddTile
 #define fbOver wfbOver
-#define fbOverlayCloseScreen wfbOverlayCloseScreen
-#define fbOverlayCopyWindow wfbOverlayCopyWindow
-#define fbOverlayCreateScreenResources wfbOverlayCreateScreenResources
-#define fbOverlayCreateWindow wfbOverlayCreateWindow
 #define fbOverlayFinishScreenInit wfbOverlayFinishScreenInit
 #define fbOverlayGeneration wfbOverlayGeneration
 #define fbOverlayGetScreenPrivateKey wfbOverlayGetScreenPrivateKey
-#define fbOverlayPaintKey wfbOverlayPaintKey
-#define fbOverlaySetupScreen wfbOverlaySetupScreen
-#define fbOverlayUpdateLayerRegion wfbOverlayUpdateLayerRegion
-#define fbOverlayWindowExposures wfbOverlayWindowExposures
-#define fbOverlayWindowLayer wfbOverlayWindowLayer
 #define fbPadPixmap wfbPadPixmap
 #define fbPictureInit wfbPictureInit
 #define fbPixmapToRegion wfbPixmapToRegion