frederik
/
xserver
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(!1954) fb: unexport FbMaskBits() macro 

No external users, so no need to keep it exported.

Signed-off-by: Enrico Weigelt, metux IT consult <info@metux.net>
This commit is contained in:
Enrico Weigelt, metux IT consult 2025-05-05 13:16:49 +02:00
parent 6af649e47e
commit 4b5815f147
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
fb/fb.h
View File

@ -128,21 +128,6 @@ typedef int FbStride;
#define FbStipMask(x,w) (FbStipRight(FB_STIP_ALLONES,(x) & FB_STIP_MASK) & \ #define FbStipMask(x,w) (FbStipRight(FB_STIP_ALLONES,(x) & FB_STIP_MASK) & \
FbStipLeft(FB_STIP_ALLONES,(FB_STIP_UNIT - ((x)+(w))) & FB_STIP_MASK)) FbStipLeft(FB_STIP_ALLONES,(FB_STIP_UNIT - ((x)+(w))) & FB_STIP_MASK))
#define FbMaskBits(x,w,l,n,r) { \
n = (w); \
r = FbRightMask((x)+n); \
l = FbLeftMask(x); \
if (l) { \
n -= FB_UNIT - ((x) & FB_MASK); \
if (n < 0) { \
n = 0; \
l &= r; \
r = 0; \
} \
} \
n >>= FB_SHIFT; \
}
#define FbByteMaskInvalid 0x10 #define FbByteMaskInvalid 0x10
#define FbPatternOffset(o,t) ((o) ^ (FbPatternOffsetBits & ~(sizeof (t) - 1))) #define FbPatternOffset(o,t) ((o) ^ (FbPatternOffsetBits & ~(sizeof (t) - 1)))

19
fb/fbbits.h
View File

@ -31,6 +31,23 @@
#include <dix-config.h> #include <dix-config.h>
#endif #endif
#include "fb/fb.h"
#define __FbMaskBits(x,w,l,n,r) { \
n = (w); \
r = FbRightMask((x)+n); \
l = FbLeftMask(x); \
if (l) { \
n -= FB_UNIT - ((x) & FB_MASK); \
if (n < 0) { \
n = 0; \
l &= r; \
r = 0; \
} \
} \
n >>= FB_SHIFT; \
}
#ifdef BITSSTORE #ifdef BITSSTORE
#define STORE(b,x) BITSSTORE(b,x) #define STORE(b,x) BITSSTORE(b,x)
#else #else
@ -785,7 +802,7 @@ POLYSEGMENT(DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment * pseg)
dstLine = dst + (intToY(pt1) + yoff + dstYoff) * dstStride; dstLine = dst + (intToY(pt1) + yoff + dstYoff) * dstStride;
dstLine += dstX >> FB_SHIFT; dstLine += dstX >> FB_SHIFT;
dstX &= FB_MASK; dstX &= FB_MASK;
FbMaskBits(dstX, width, startmask, nmiddle, endmask); __FbMaskBits(dstX, width, startmask, nmiddle, endmask);
if (startmask) { if (startmask) {
WRITE(dstLine, WRITE(dstLine,
FbDoMaskRRop(READ(dstLine), andBits, xorBits, FbDoMaskRRop(READ(dstLine), andBits, xorBits,