[PATCH 4/5] fb: Delete fbCompositeGeneral()

Søren Sandmann sandmann at daimi.au.dk
Mon Nov 1 19:40:41 PDT 2010


From: Søren Sandmann Pedersen <ssp at redhat.com>

This function was an unused and trivial wrapper around fbComposite().
---
 fb/fbpict.c |   19 -------------------
 fb/fbpict.h |   16 ----------------
 2 files changed, 0 insertions(+), 35 deletions(-)

diff --git a/fb/fbpict.c b/fb/fbpict.c
index 3bc141b..7636040 100644
--- a/fb/fbpict.c
+++ b/fb/fbpict.c
@@ -76,25 +76,6 @@ fbComposite (CARD8      op,
     free_pixman_pict (pDst, dest);
 }
 
-void
-fbCompositeGeneral (CARD8	op,
-		    PicturePtr	pSrc,
-		    PicturePtr	pMask,
-		    PicturePtr	pDst,
-		    INT16	xSrc,
-		    INT16	ySrc,
-		    INT16	xMask,
-		    INT16	yMask,
-		    INT16	xDst,
-		    INT16	yDst,
-		    CARD16	width,
-		    CARD16	height)
-{
-    fbComposite (op, pSrc, pMask, pDst,
-			xSrc, ySrc, xMask, yMask, xDst, yDst,
-			width, height);
-}
-
 static pixman_image_t *
 create_solid_fill_image (PicturePtr pict)
 {
diff --git a/fb/fbpict.h b/fb/fbpict.h
index 34a3eae..b02b950 100644
--- a/fb/fbpict.h
+++ b/fb/fbpict.h
@@ -395,22 +395,6 @@ typedef struct _FbComposeFunctions {
     CombineMaskU combineMaskU;
 } FbComposeFunctions;
 
-/* fbcompose.c */
-
-extern _X_EXPORT void
-fbCompositeGeneral (CARD8	op,
-		    PicturePtr	pSrc,
-		    PicturePtr	pMask,
-		    PicturePtr	pDst,
-		    INT16	xSrc,
-		    INT16	ySrc,
-		    INT16	xMask,
-		    INT16	yMask,
-		    INT16	xDst,
-		    INT16	yDst,
-		    CARD16	width,
-		    CARD16	height);
-
 /* fbpict.c */
 extern _X_EXPORT void
 fbComposite (CARD8      op,
-- 
1.7.3.1



More information about the xorg-devel mailing list