From 5058cbebb68383c3a450b9bca2403d6b042f60da Mon Sep 17 00:00:00 2001 From: Søren Sandmann Pedersen Date: Sat, 26 Feb 2011 05:32:16 -0500 Subject: Delete miRenderPixelToColor() and miRenderColorToPixel(). They are not used anymore. Signed-off-by: Soren Sandmann --- render/mipict.c | 84 --------------------------------------------------------- render/mipict.h | 10 ------- 2 files changed, 94 deletions(-) diff --git a/render/mipict.c b/render/mipict.c index c3c194c1a..56e6adba0 100644 --- a/render/mipict.c +++ b/render/mipict.c @@ -487,57 +487,6 @@ miComputeCompositeRegion (RegionPtr pRegion, return TRUE; } -void -miRenderColorToPixel (PictFormatPtr format, - xRenderColor *color, - CARD32 *pixel) -{ - CARD32 r, g, b, a; - miIndexedPtr pIndexed; - - switch (format->type) { - case PictTypeDirect: - r = color->red >> (16 - Ones (format->direct.redMask)); - g = color->green >> (16 - Ones (format->direct.greenMask)); - b = color->blue >> (16 - Ones (format->direct.blueMask)); - a = color->alpha >> (16 - Ones (format->direct.alphaMask)); - r = r << format->direct.red; - g = g << format->direct.green; - b = b << format->direct.blue; - a = a << format->direct.alpha; - *pixel = r|g|b|a; - break; - case PictTypeIndexed: - pIndexed = (miIndexedPtr) (format->index.devPrivate); - if (pIndexed->color) - { - r = color->red >> 11; - g = color->green >> 11; - b = color->blue >> 11; - *pixel = miIndexToEnt15 (pIndexed, (r << 10) | (g << 5) | b); - } - else - { - r = color->red >> 8; - g = color->green >> 8; - b = color->blue >> 8; - *pixel = miIndexToEntY24 (pIndexed, (r << 16) | (g << 8) | b); - } - break; - } -} - -static CARD16 -miFillColor (CARD32 pixel, int bits) -{ - while (bits < 16) - { - pixel |= pixel << bits; - bits <<= 1; - } - return (CARD16) pixel; -} - Bool miIsSolidAlpha (PicturePtr pSrc) { @@ -572,39 +521,6 @@ miIsSolidAlpha (PicturePtr pSrc) } } -void -miRenderPixelToColor (PictFormatPtr format, - CARD32 pixel, - xRenderColor *color) -{ - CARD32 r, g, b, a; - miIndexedPtr pIndexed; - - switch (format->type) { - case PictTypeDirect: - r = (pixel >> format->direct.red) & format->direct.redMask; - g = (pixel >> format->direct.green) & format->direct.greenMask; - b = (pixel >> format->direct.blue) & format->direct.blueMask; - a = (pixel >> format->direct.alpha) & format->direct.alphaMask; - color->red = miFillColor (r, Ones (format->direct.redMask)); - color->green = miFillColor (g, Ones (format->direct.greenMask)); - color->blue = miFillColor (b, Ones (format->direct.blueMask)); - color->alpha = miFillColor (a, Ones (format->direct.alphaMask)); - break; - case PictTypeIndexed: - pIndexed = (miIndexedPtr) (format->index.devPrivate); - pixel = pIndexed->rgba[pixel & (MI_MAX_INDEXED-1)]; - r = (pixel >> 16) & 0xff; - g = (pixel >> 8) & 0xff; - b = (pixel ) & 0xff; - color->red = miFillColor (r, 8); - color->green = miFillColor (g, 8); - color->blue = miFillColor (b, 8); - color->alpha = 0xffff; - break; - } -} - Bool miPictureInit (ScreenPtr pScreen, PictFormatPtr formats, int nformats) { diff --git a/render/mipict.h b/render/mipict.h index 0357f03b2..dd3ec29f3 100644 --- a/render/mipict.h +++ b/render/mipict.h @@ -122,16 +122,6 @@ miGlyphs (CARD8 op, GlyphListPtr list, GlyphPtr *glyphs); -extern _X_EXPORT void -miRenderColorToPixel (PictFormatPtr pPict, - xRenderColor *color, - CARD32 *pixel); - -extern _X_EXPORT void -miRenderPixelToColor (PictFormatPtr pPict, - CARD32 pixel, - xRenderColor *color); - extern _X_EXPORT Bool miIsSolidAlpha (PicturePtr pSrc); -- cgit v1.2.3