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:
28
cfb/cfbgc.c
28
cfb/cfbgc.c
@@ -85,11 +85,13 @@ SOFTWARE.
|
||||
# define usePolyGlyphBlt miPolyGlyphBlt
|
||||
#endif
|
||||
|
||||
void cfbUnPushPixels (GCPtr, PixmapPtr, DrawablePtr, int, int, int, int);
|
||||
|
||||
#ifdef FOUR_BIT_CODE
|
||||
# define usePushPixels cfbPushPixels8
|
||||
#else
|
||||
#ifndef LOWMEMFTPT
|
||||
# define usePushPixels mfbPushPixels
|
||||
# define usePushPixels cfbUnPushPixels
|
||||
#else
|
||||
# define usePushPixels miPushPixels
|
||||
#endif /* ifndef LOWMEMFTPT */
|
||||
@@ -284,6 +286,14 @@ cfbCreateGC(pGC)
|
||||
pGC->clientClip = NULL;
|
||||
pGC->clientClipType = CT_NONE;
|
||||
|
||||
if (cfbNonTEOps.PushPixels == cfbUnPushPixels)
|
||||
{
|
||||
cfbTEOps1Rect.PushPixels = mfbPushPixelsWeak();
|
||||
cfbNonTEOps1Rect.PushPixels = mfbPushPixelsWeak();
|
||||
cfbTEOps.PushPixels = mfbPushPixelsWeak();
|
||||
cfbNonTEOps.PushPixels = mfbPushPixelsWeak();
|
||||
}
|
||||
|
||||
/*
|
||||
* some of the output primitives aren't really necessary, since they
|
||||
* will be filled in ValidateGC because of dix/CreateGC() setting all
|
||||
@@ -767,7 +777,7 @@ cfbValidateGC(pGC, changes, pDrawable)
|
||||
#endif
|
||||
#ifdef FOUR_BIT_CODE
|
||||
#ifndef LOWMEMFTPT
|
||||
pGC->ops->PushPixels = mfbPushPixels;
|
||||
pGC->ops->PushPixels = mfbPushPixelsWeak();
|
||||
#else
|
||||
pGC->ops->PushPixels = miPushPixels;
|
||||
#endif /* ifndef LOWMEMFTPT */
|
||||
@@ -789,3 +799,17 @@ cfbValidateGC(pGC, changes, pDrawable)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
/*
|
||||
* this is never called, it just exists to have its address
|
||||
* taken in mfbCreateGC.
|
||||
*/
|
||||
static void
|
||||
cfbUnPushPixels (pGC, pBitmap, pDrawable, dx, dy, xOrg, yOrg)
|
||||
GCPtr pGC;
|
||||
PixmapPtr pBitmap;
|
||||
DrawablePtr pDrawable;
|
||||
int dx, dy, xOrg, yOrg;
|
||||
{
|
||||
return;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user