diff options
Diffstat (limited to 'xorg-server/fb/fbrop.h')
| -rw-r--r-- | xorg-server/fb/fbrop.h | 21 |
1 files changed, 11 insertions, 10 deletions
diff --git a/xorg-server/fb/fbrop.h b/xorg-server/fb/fbrop.h index a01fdabfe..4362adb37 100644 --- a/xorg-server/fb/fbrop.h +++ b/xorg-server/fb/fbrop.h @@ -24,10 +24,10 @@ #define _FBROP_H_ typedef struct _mergeRopBits { - FbBits ca1, cx1, ca2, cx2; + FbBits ca1, cx1, ca2, cx2; } FbMergeRopRec, *FbMergeRopPtr; -extern _X_EXPORT const FbMergeRopRec FbMergeRopBits[16]; +extern _X_EXPORT const FbMergeRopRec FbMergeRopBits[16]; #define FbDeclareMergeRop() FbBits _ca1, _cx1, _ca2, _cx2; #define FbDeclarePrebuiltMergeRop() FbBits _cca, _ccx; @@ -95,21 +95,22 @@ extern _X_EXPORT const FbMergeRopRec FbMergeRopBits[16]; * Stippling operations; */ -extern _X_EXPORT const FbBits fbStipple16Bits[256]; /* half of table */ +extern _X_EXPORT const FbBits fbStipple16Bits[256]; /* half of table */ + #define FbStipple16Bits(b) \ (fbStipple16Bits[(b)&0xff] | fbStipple16Bits[(b) >> 8] << FB_HALFUNIT) -extern _X_EXPORT const FbBits fbStipple8Bits[256]; -extern _X_EXPORT const FbBits fbStipple4Bits[16]; -extern _X_EXPORT const FbBits fbStipple2Bits[4]; -extern _X_EXPORT const FbBits fbStipple1Bits[2]; -extern _X_EXPORT const FbBits *const fbStippleTable[]; +extern _X_EXPORT const FbBits fbStipple8Bits[256]; +extern _X_EXPORT const FbBits fbStipple4Bits[16]; +extern _X_EXPORT const FbBits fbStipple2Bits[4]; +extern _X_EXPORT const FbBits fbStipple1Bits[2]; +extern _X_EXPORT const FbBits *const fbStippleTable[]; #define FbStippleRRop(dst, b, fa, fx, ba, bx) \ (FbDoRRop(dst, fa, fx) & b) | (FbDoRRop(dst, ba, bx) & ~b) #define FbStippleRRopMask(dst, b, fa, fx, ba, bx, m) \ (FbDoMaskRRop(dst, fa, fx, m) & (b)) | (FbDoMaskRRop(dst, ba, bx, m) & ~(b)) - + #define FbDoLeftMaskByteStippleRRop(dst, b, fa, fx, ba, bx, lb, l) { \ FbBits __xor = ((fx) & (b)) | ((bx) & ~(b)); \ FbDoLeftMaskByteRRop(dst, lb, l, ((fa) & (b)) | ((ba) & ~(b)), __xor); \ @@ -121,7 +122,7 @@ extern _X_EXPORT const FbBits *const fbStippleTable[]; } #define FbOpaqueStipple(b, fg, bg) (((fg) & (b)) | ((bg) & ~(b))) - + /* * Compute rop for using tile code for 1-bit dest stipples; modifies * existing rop to flip depending on pixel values |