summaryrefslogtreecommitdiff
path: root/fb
diff options
context:
space:
mode:
authorSøren Sandmann Pedersen <ssp@redhat.com>2010-11-01 22:17:08 -0400
committerSøren Sandmann Pedersen <ssp@l3000.localdomain>2010-11-02 03:36:45 -0400
commit0dae479e16590e767df35985150c5acf696e5df2 (patch)
tree55b8f365a66e0422e79dae7da9d909fed26ec55b /fb
parent74bc2d8c6bafc5373ff9c14eed12e26b5b965953 (diff)
fb: Delete fbCompositeGeneral()
This function was an unused and trivial wrapper around fbComposite(). Reviewed-by: Aaron Plattner <aplattner@nvidia.com> Reviewed-by: Mikhail Gusarov <dottedmag@dottedmag.net> Signed-off-by: Søren Sandmann <ssp@redhat.com>
Diffstat (limited to 'fb')
-rw-r--r--fb/fbpict.c19
-rw-r--r--fb/fbpict.h16
2 files changed, 0 insertions, 35 deletions
diff --git a/fb/fbpict.c b/fb/fbpict.c
index 3bc141bcd..7636040c6 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 34a3eae2a..b02b95068 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,