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/fb.h | |
| 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/fb.h')
| -rw-r--r-- | fb/fb.h | 27 |
1 files changed, 0 insertions, 27 deletions
@@ -98,20 +98,12 @@ #error "GLYPHPADBYTES must be 4" #endif /* whether to bother to include 24bpp support */ -#ifndef FBNO24BIT -#define FB_24BIT -#endif /* * Unless otherwise instructed, fb includes code to advertise 24bpp * windows with 32bpp image format for application compatibility */ -#ifdef FB_24BIT -#ifndef FBNO24_32 -#define FB_24_32BIT -#endif -#endif #define FB_STIP_SHIFT LOG2_BITMAP_PAD #define FB_STIP_UNIT (1 << FB_STIP_SHIFT) @@ -234,15 +226,6 @@ extern _X_EXPORT void fbSetBits (FbStip *bits, int stride, FbStip data); n >>= FB_SHIFT; \ } -#ifdef FBNOPIXADDR -#define FbMaskBitsBytes(x,w,copy,l,lb,n,r,rb) FbMaskBits(x,w,l,n,r) -#define FbDoLeftMaskByteRRop(dst,lb,l,and,xor) { \ - *dst = FbDoMaskRRop(*dst,and,xor,l); \ -} -#define FbDoRightMaskByteRRop(dst,rb,r,and,xor) { \ - *dst = FbDoMaskRRop(*dst,and,xor,r); \ -} -#else #define FbByteMaskInvalid 0x10 @@ -454,7 +437,6 @@ extern _X_EXPORT void fbSetBits (FbStip *bits, int stride, FbStip data); WRITE(dst, FbDoMaskRRop (READ(dst), and, xor, r)); \ } \ } -#endif #define FbMaskStip(x,w,l,n,r) { \ n = (w); \ @@ -612,9 +594,6 @@ fbGetWinPrivateKey (void); extern _X_EXPORT const GCOps fbGCOps; extern _X_EXPORT const GCFuncs fbGCFuncs; -#ifdef FB_24_32BIT -#define FB_SCREEN_PRIVATE -#endif /* Framebuffer access wrapper */ typedef FbBits (*ReadMemoryProcPtr)(const void *src, int size); @@ -642,7 +621,6 @@ typedef void (*FinishWrapProcPtr)(DrawablePtr pDraw); #endif -#ifdef FB_SCREEN_PRIVATE extern _X_EXPORT DevPrivateKey fbGetScreenPrivateKey(void); @@ -658,7 +636,6 @@ typedef struct { #define fbGetScreenPrivate(pScreen) ((FbScreenPrivPtr) \ dixLookupPrivate(&(pScreen)->devPrivates, fbGetScreenPrivateKey())) -#endif /* private field of GC */ typedef struct { @@ -1223,7 +1200,6 @@ fbBltOne (FbStip *src, FbBits bgand, FbBits bgxor); -#ifdef FB_24BIT extern _X_EXPORT void fbBltOne24 (FbStip *src, FbStride srcStride, /* FbStip units per scanline */ @@ -1240,7 +1216,6 @@ fbBltOne24 (FbStip *src, FbBits fgxor, FbBits bgand, FbBits bgxor); -#endif extern _X_EXPORT void fbBltPlane (FbBits *src, @@ -1868,7 +1843,6 @@ fbSolid (FbBits *dst, FbBits and, FbBits xor); -#ifdef FB_24BIT extern _X_EXPORT void fbSolid24 (FbBits *dst, FbStride dstStride, @@ -1879,7 +1853,6 @@ fbSolid24 (FbBits *dst, FbBits and, FbBits xor); -#endif /* * fbstipple.c |