diff options
| author | Dave Airlie <airlied@redhat.com> | 2011-03-29 14:27:41 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2011-04-01 10:28:06 +1000 |
| commit | be9cfb249da18d134c1d65bbb75161aff65f2942 (patch) | |
| tree | 6dbbadeaeed6ce53a5308c0da8b6353940face20 /fb/fbglyph.c | |
| parent | e0a2ad51dfb7373aa602335490d9666d6101b5ea (diff) | |
fb: drop defines that aren't used/necessary anymore.
This was generated by:
cd fb
coan source --replace -DFB_SCREEN_PRIVATE -DFB_24BIT -DFB_24_32BIT -DFB_SCREEN_PRIVATE -UFBNOPIXADDR -UFBNO24BIT -UFBNO24_32 *.[ch]
A follow up patch readds the FB_24_32BIT define for Intel UXA.
Signed-off-by: Dave Airlie <airlied@redhat.com>
Reviewed-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'fb/fbglyph.c')
| -rw-r--r-- | fb/fbglyph.c | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/fb/fbglyph.c b/fb/fbglyph.c index 8208081e2..643cf909f 100644 --- a/fb/fbglyph.c +++ b/fb/fbglyph.c @@ -57,8 +57,6 @@ fbGlyphIn (RegionPtr pRegion, return RegionContainsRect(pRegion, &box) == rgnIN; } -#ifdef FB_24BIT -#ifndef FBNOPIXADDR #define WRITE1(d,n,fg) WRITE((d) + (n), (CARD8) fg) #define WRITE2(d,n,fg) WRITE((CARD16 *) &(d[n]), (CARD16) fg) @@ -248,8 +246,6 @@ fbGlyph24 (FbBits *dstBits, dstLine += dstStride; } } -#endif -#endif void fbPolyGlyphBlt (DrawablePtr pDrawable, @@ -266,7 +262,6 @@ fbPolyGlyphBlt (DrawablePtr pDrawable, int gx, gy; int gWidth, gHeight; /* width and height of glyph */ FbStride gStride; /* stride of glyph */ -#ifndef FBNOPIXADDR void (*glyph) (FbBits *, FbStride, int, @@ -286,13 +281,10 @@ fbPolyGlyphBlt (DrawablePtr pDrawable, switch (dstBpp) { case 8: glyph = fbGlyph8; break; case 16: glyph = fbGlyph16; break; -#ifdef FB_24BIT case 24: glyph = fbGlyph24; break; -#endif case 32: glyph = fbGlyph32; break; } } -#endif x += pDrawable->x; y += pDrawable->y; @@ -306,7 +298,6 @@ fbPolyGlyphBlt (DrawablePtr pDrawable, { gx = x + pci->metrics.leftSideBearing; gy = y - pci->metrics.ascent; -#ifndef FBNOPIXADDR if (glyph && gWidth <= sizeof (FbStip) * 8 && fbGlyphIn (fbGetCompositeClip(pGC), gx, gy, gWidth, gHeight)) { @@ -321,7 +312,6 @@ fbPolyGlyphBlt (DrawablePtr pDrawable, fbFinishAccess (pDrawable); } else -#endif { gStride = GLYPHWIDTHBYTESPADDED(pci) / sizeof (FbStip); fbPushImage (pDrawable, @@ -359,7 +349,6 @@ fbImageGlyphBlt (DrawablePtr pDrawable, Bool opaque; int n; int gx, gy; -#ifndef FBNOPIXADDR void (*glyph) (FbBits *, FbStride, int, @@ -379,21 +368,16 @@ fbImageGlyphBlt (DrawablePtr pDrawable, switch (dstBpp) { case 8: glyph = fbGlyph8; break; case 16: glyph = fbGlyph16; break; -#ifdef FB_24BIT case 24: glyph = fbGlyph24; break; -#endif case 32: glyph = fbGlyph32; break; } } -#endif x += pDrawable->x; y += pDrawable->y; if (TERMINALFONT (pGC->font) -#ifndef FBNOPIXADDR && !glyph -#endif ) { opaque = TRUE; @@ -439,7 +423,6 @@ fbImageGlyphBlt (DrawablePtr pDrawable, { gx = x + pci->metrics.leftSideBearing; gy = y - pci->metrics.ascent; -#ifndef FBNOPIXADDR if (glyph && gWidth <= sizeof (FbStip) * 8 && fbGlyphIn (fbGetCompositeClip(pGC), gx, gy, gWidth, gHeight)) { @@ -454,7 +437,6 @@ fbImageGlyphBlt (DrawablePtr pDrawable, fbFinishAccess (pDrawable); } else -#endif { gStride = GLYPHWIDTHBYTESPADDED(pci) / sizeof (FbStip); fbPutXYImage (pDrawable, |