xc/programs/Xserver/afb/afbbres.c
xc/programs/Xserver/afb/afbbresd.c xc/programs/Xserver/afb/afbclip.c xc/programs/Xserver/afb/afbhrzvert.c xc/programs/Xserver/afb/afbline.c xc/programs/Xserver/afb/afbmodule.c xc/programs/Xserver/afb/afbpixmap.c xc/programs/Xserver/afb/afbpolypnt.c xc/programs/Xserver/afb/afbpushpxl.c xc/programs/Xserver/afb/afbtegblt.c xc/programs/Xserver/cfb/Imakefile.inc xc/programs/Xserver/cfb/cfballpriv.c xc/programs/Xserver/cfb/cfbbitblt.c xc/programs/Xserver/cfb/cfbcppl.c xc/programs/Xserver/cfb/cfbgc.c xc/programs/Xserver/cfb/cfbglblt8.c xc/programs/Xserver/cfb/cfbmap.h xc/programs/Xserver/cfb/cfbpixmap.c xc/programs/Xserver/cfb/cfbscrinit.c xc/programs/Xserver/cfb/cfbtab.h xc/programs/Xserver/cfb/cfbteblt8.c xc/programs/Xserver/cfb/cfbunmap.h xc/programs/Xserver/mfb/maskbits.c xc/programs/Xserver/mfb/maskbits.h xc/programs/Xserver/mfb/mergerop.h xc/programs/Xserver/mfb/mfb.h xc/programs/Xserver/mfb/mfbclip.c xc/programs/Xserver/mfb/mfbfont.c xc/programs/Xserver/mfb/mfbgc.c xc/programs/Xserver/mfb/mfbmisc.c xc/programs/Xserver/mfb/mfbpushpxl.c //bugs.freedesktop.org/show_bug.cgi?id=1114) attachment #667 (https://bugs.freedesktop.org/attachment.cgi?id=667): Convert afb and cfb{,16,24,32} to be dlloader-friendly. Patch by Adam Jackson <ajax@freedesktop.org>.
This commit is contained in:
@@ -39,6 +39,7 @@ typedef struct _mergeRopBits {
|
||||
} mergeRopRec, *mergeRopPtr;
|
||||
|
||||
extern mergeRopRec mergeRopBits[16];
|
||||
extern mergeRopPtr mergeGetRopBits(int i);
|
||||
|
||||
#if defined(PPW) && defined(PGSZ) && (PPW != PGSZ) /* cfb */
|
||||
#define DeclareMergeRop() MfbBits _ca1 = 0, _cx1 = 0, _ca2 = 0, _cx2 = 0;
|
||||
@@ -59,7 +60,7 @@ extern mergeRopRec mergeRopBits[16];
|
||||
MfbBits _pm; \
|
||||
mergeRopPtr _bits; \
|
||||
_pm = PFILL(pm); \
|
||||
_bits = &mergeRopBits[alu]; \
|
||||
_bits = mergeGetRopBits(alu); \
|
||||
_ca1 = _bits->ca1 & _pm; \
|
||||
_cx1 = _bits->cx1 | ~_pm; \
|
||||
_ca2 = _bits->ca2 & _pm; \
|
||||
@@ -70,7 +71,7 @@ extern mergeRopRec mergeRopBits[16];
|
||||
#define InitializeMergeRop24(alu,pm) {\
|
||||
register int i; \
|
||||
register MfbBits _pm = (pm) & 0xFFFFFF; \
|
||||
mergeRopPtr _bits = &mergeRopBits[alu]; \
|
||||
mergeRopPtr _bits = mergeGetRopBits(alu); \
|
||||
MfbBits _bits_ca1 = _bits->ca1; \
|
||||
MfbBits _bits_cx1 = _bits->cx1; \
|
||||
MfbBits _bits_ca2 = _bits->ca2; \
|
||||
@@ -88,7 +89,7 @@ extern mergeRopRec mergeRopBits[16];
|
||||
#define InitializeMergeRop24(alu,pm) {\
|
||||
register int i; \
|
||||
register MfbBits _pm = (pm) & cfbmask[0]; \
|
||||
mergeRopPtr _bits = &mergeRopBits[alu]; \
|
||||
mergeRopPtr _bits = mergeGetRopBits(alu); \
|
||||
MfbBits _bits_ca1 = _bits->ca1 & cfbmask[0]; \
|
||||
MfbBits _bits_cx1 = _bits->cx1 & cfbmask[0]; \
|
||||
MfbBits _bits_ca2 = _bits->ca2 & cfbmask[0]; \
|
||||
@@ -111,7 +112,7 @@ extern mergeRopRec mergeRopBits[16];
|
||||
#else /* mfb */
|
||||
#define InitializeMergeRop(alu,pm) {\
|
||||
mergeRopPtr _bits; \
|
||||
_bits = &mergeRopBits[alu]; \
|
||||
_bits = mergeGetRopBits(alu); \
|
||||
_ca1 = _bits->ca1; \
|
||||
_cx1 = _bits->cx1; \
|
||||
_ca2 = _bits->ca2; \
|
||||
@@ -328,7 +329,7 @@ extern mergeRopRec mergeRopBits[16];
|
||||
#define MROP_DECLARE_REG() register MROP_DECLARE()
|
||||
#define MROP_INITIALIZE(alu,pm) { \
|
||||
mergeRopPtr _bits; \
|
||||
_bits = &mergeRopBits[alu]; \
|
||||
_bits = mergeGetRopBits(alu); \
|
||||
_ca1 = _bits->ca1; \
|
||||
_cx1 = _bits->cx1; \
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user