fb: drop some more drawable->screen conversion

8 files changed, 16 insertions, 16 deletions

diff --git a/fb/fb.h b/fb/fb.h
index 441671223..91c42886d 100644
--- a/fb/fb.h
+++ b/fb/fb.h
@@ -1205,7 +1205,7 @@ extern _X_EXPORT void
 
 extern _X_EXPORT void
 
-fbSolidBoxClipped(DrawablePtr pDrawable,
+fbSolidBoxClipped(ScreenPtr pScreen, DrawablePtr pDrawable,
                   RegionPtr pClip,
                   int xa, int ya, int xb, int yb, FbBits and, FbBits xor);
 
@@ -1685,7 +1685,7 @@ fbChangeWindowAttributes(ScreenPtr pScreen, WindowPtr pWin, unsigned long mask);
 
 extern _X_EXPORT void
 
-fbFillRegionSolid(DrawablePtr pDrawable,
+fbFillRegionSolid(ScreenPtr pScreen, DrawablePtr pDrawable,
                   RegionPtr pRegion, FbBits and, FbBits xor);
 
 extern _X_EXPORT pixman_image_t *image_from_pict(PicturePtr pict,
diff --git a/fb/fbbits.h b/fb/fbbits.h
index 8dda43f0e..406b1e459 100644
--- a/fb/fbbits.h
+++ b/fb/fbbits.h
@@ -599,7 +599,7 @@ POLYLINE(DrawablePtr pDrawable,
     INT32 *pts = (INT32 *) ptsOrig;
     int xoff = pDrawable->x;
     int yoff = pDrawable->y;
-    unsigned int bias = miGetZeroLineBias(pDrawable->pScreen);
+    unsigned int bias = miGetZeroLineBias(pGC->pScreen);
     BoxPtr pBox = RegionExtents(fbGetCompositeClip(pGC));
 
     FbBits *dst;
@@ -720,7 +720,7 @@ POLYSEGMENT(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment * pseg)
     INT32 *pts = (INT32 *) pseg;
     int xoff = pDrawable->x;
     int yoff = pDrawable->y;
-    unsigned int bias = miGetZeroLineBias(pDrawable->pScreen);
+    unsigned int bias = miGetZeroLineBias(pGC->pScreen);
     BoxPtr pBox = RegionExtents(fbGetCompositeClip(pGC));
 
     FbBits *dst;
diff --git a/fb/fbfill.c b/fb/fbfill.c
index 4d172f7f2..eb20a1b54 100644
--- a/fb/fbfill.c
+++ b/fb/fbfill.c
@@ -139,7 +139,7 @@ fbFill(DrawablePtr pDrawable, GCPtr pGC, int x, int y, int width, int height)
 }
 
 void
-fbSolidBoxClipped(DrawablePtr pDrawable,
+fbSolidBoxClipped(ScreenPtr pScreen, DrawablePtr pDrawable,
                   RegionPtr pClip,
                   int x1, int y1, int x2, int y2, FbBits and, FbBits xor)
 {
@@ -151,7 +151,7 @@ fbSolidBoxClipped(DrawablePtr pDrawable,
     int nbox;
     int partX1, partX2, partY1, partY2;
 
-    fbGetDrawable(pDrawable->pScreen, pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
+    fbGetDrawable(pScreen, pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
 
     for (nbox = RegionNumRects(pClip), pbox = RegionRects(pClip);
          nbox--; pbox++) {
diff --git a/fb/fbglyph.c b/fb/fbglyph.c
index 62d91fced..c444ae971 100644
--- a/fb/fbglyph.c
+++ b/fb/fbglyph.c
@@ -369,7 +369,7 @@ fbImageGlyphBlt(DrawablePtr pDrawable,
         }
         yBack = y - FONTASCENT(pGC->font);
         heightBack = FONTASCENT(pGC->font) + FONTDESCENT(pGC->font);
-        fbSolidBoxClipped(pDrawable,
+        fbSolidBoxClipped(pGC->pScreen, pDrawable,
                           fbGetCompositeClip(pGC),
                           xBack,
                           yBack,
diff --git a/fb/fboverlay.c b/fb/fboverlay.c
index 8261100dd..5e7fe666f 100644
--- a/fb/fboverlay.c
+++ b/fb/fboverlay.c
@@ -148,10 +148,10 @@ fbOverlayCreateScreenResources(ScreenPtr pScreen)
 }
 
 void
-fbOverlayPaintKey(DrawablePtr pDrawable,
+fbOverlayPaintKey(ScreenPtr pScreen, DrawablePtr pDrawable,
                   RegionPtr pRegion, CARD32 pixel, int layer)
 {
-    fbFillRegionSolid(pDrawable, pRegion, 0,
+    fbFillRegionSolid(pScreen, pDrawable, pRegion, 0,
                       fbReplicatePixel(pixel, pDrawable->bitsPerPixel));
 }
 
@@ -177,7 +177,7 @@ fbOverlayUpdateLayerRegion(ScreenPtr pScreen, int layer, RegionPtr prgn)
             /* paint new piece with chroma key */
             RegionNull(&rgnNew);
             RegionIntersect(&rgnNew, prgn, &pScrPriv->layer[i].u.run.region);
-            (*pScrPriv->PaintKey) (&pScrPriv->layer[i].u.run.pixmap->drawable,
+            (*pScrPriv->PaintKey) (pScreen, &pScrPriv->layer[i].u.run.pixmap->drawable,
                                    &rgnNew, pScrPriv->layer[i].key, i);
             RegionUninit(&rgnNew);
             /* remove piece from other fbs */
diff --git a/fb/fboverlay.h b/fb/fboverlay.h
index 2d5a6c795..b3ec3d961 100644
--- a/fb/fboverlay.h
+++ b/fb/fboverlay.h
@@ -33,7 +33,7 @@ extern _X_EXPORT DevPrivateKey fbOverlayGetScreenPrivateKey(void);
 #define FB_OVERLAY_MAX	2
 #endif
 
-typedef void (*fbOverlayPaintKeyProc) (DrawablePtr, RegionPtr, CARD32, int);
+typedef void (*fbOverlayPaintKeyProc) (ScreenPtr, DrawablePtr, RegionPtr, CARD32, int);
 
 typedef struct _fbOverlayLayer {
     union {
@@ -73,7 +73,7 @@ extern _X_EXPORT Bool
 
 extern _X_EXPORT void
 
-fbOverlayPaintKey(DrawablePtr pDrawable,
+fbOverlayPaintKey(ScreenPtr pScreen, DrawablePtr pDrawable,
                   RegionPtr pRegion, CARD32 pixel, int layer);
 extern _X_EXPORT void
  fbOverlayUpdateLayerRegion(ScreenPtr pScreen, int layer, RegionPtr prgn);
diff --git a/fb/fbseg.c b/fb/fbseg.c
index cf8e3aae4..15620ddc4 100644
--- a/fb/fbseg.c
+++ b/fb/fbseg.c
@@ -524,7 +524,7 @@ fbSegment(DrawablePtr pDrawable,
     int octant;
     int dashoff;
     int doff;
-    unsigned int bias = miGetZeroLineBias(pDrawable->pScreen);
+    unsigned int bias = miGetZeroLineBias(pGC->pScreen);
     unsigned int oc1;           /* outcode of point 1 */
     unsigned int oc2;           /* outcode of point 2 */
 
diff --git a/fb/fbwindow.c b/fb/fbwindow.c
index 54eb60495..2829214f8 100644
--- a/fb/fbwindow.c
+++ b/fb/fbwindow.c
@@ -108,7 +108,7 @@ fbCopyWindow(ScreenPtr pScreen, WindowPtr pWin, DDXPointRec ptOldOrg, RegionPtr
     RegionRec rgnDst;
     int dx, dy;
 
-    PixmapPtr pPixmap = GetDrawablePixmap(pWin->drawable.pScreen, &pWin->drawable);
+    PixmapPtr pPixmap = GetDrawablePixmap(pScreen, &pWin->drawable);
     DrawablePtr pDrawable = &pPixmap->drawable;
 
     dx = ptOldOrg.x - pWin->drawable.x;
@@ -162,7 +162,7 @@ fbChangeWindowAttributes(ScreenPtr pScreen, WindowPtr pWin, unsigned long mask)
 }
 
 void
-fbFillRegionSolid(DrawablePtr pDrawable,
+fbFillRegionSolid(ScreenPtr pScreen, DrawablePtr pDrawable,
                   RegionPtr pRegion, FbBits and, FbBits xor)
 {
     FbBits *dst;
@@ -179,7 +179,7 @@ fbFillRegionSolid(DrawablePtr pDrawable,
         try_mmx = 1;
 #endif
 
-    fbGetDrawable(pDrawable->pScreen, pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
+    fbGetDrawable(pScreen, pDrawable, dst, dstStride, dstBpp, dstXoff, dstYoff);
 
     while (n--) {
 #ifndef FB_ACCESS_WRAPPER