Bug #962: Remove LoaderSymbol calls introduced by the dlloader work so
DoLoadableServer NO builds work again.
This commit is contained in:
parent
734cb34dc1
commit
d112e55992
|
@ -168,3 +168,27 @@ fbdevHWSaveScreen(ScreenPtr pScreen, int mode)
|
|||
{
|
||||
return FALSE;
|
||||
}
|
||||
|
||||
xf86SwitchModeProc *
|
||||
fbdevHWSwitchModeWeak(void) { return fbdevHWSwitchMode; }
|
||||
|
||||
xf86AdjustFrameProc *
|
||||
fbdevHWAdjustFrameWeak(void) { return fbdevHWAdjustFrame; }
|
||||
|
||||
xf86EnterVTProc *
|
||||
fbdevHWEnterVTWeak(void) { return fbdevHWEnterVT; }
|
||||
|
||||
xf86LeaveVTProc *
|
||||
fbdevHWLeaveVTWeak(void) { return fbdevHWLeaveVT; }
|
||||
|
||||
xf86ValidModeProc *
|
||||
fbdevHWValidModeWeak(void) { return fbdevHWValidMode; }
|
||||
|
||||
xf86DPMSSetProc *
|
||||
fbdevHWDPMSSetWeak(void) { return fbdevHWDPMSSet; }
|
||||
|
||||
xf86LoadPaletteProc *
|
||||
fbdevHWLoadPaletteWeak(void) { return fbdevHWLoadPalette; }
|
||||
|
||||
SaveScreenProcPtr
|
||||
fbdevHWSaveScreenWeak(void) { return fbdevHWSaveScreen; }
|
||||
|
|
|
@ -374,6 +374,10 @@ IBMramdac526SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg)
|
|||
}
|
||||
}
|
||||
|
||||
IBMramdac526SetBppProc *IBMramdac526SetBppWeak(void) {
|
||||
return IBMramdac526SetBpp;
|
||||
}
|
||||
|
||||
void
|
||||
IBMramdac640SetBpp(ScrnInfoPtr pScrn, RamDacRegRecPtr ramdacReg)
|
||||
{
|
||||
|
|
|
@ -18,6 +18,9 @@ unsigned long IBMramdac640CalculateMNPCForClock(unsigned long RefClock,
|
|||
void IBMramdac526HWCursorInit(xf86CursorInfoPtr infoPtr);
|
||||
void IBMramdac640HWCursorInit(xf86CursorInfoPtr infoPtr);
|
||||
|
||||
typedef void IBMramdac526SetBppProc(ScrnInfoPtr, RamDacRegRecPtr);
|
||||
IBMramdac526SetBppProc *IBMramdac526SetBppWeak(void);
|
||||
|
||||
#define IBM524_RAMDAC ((VENDOR_IBM << 16) | 0x00)
|
||||
#define IBM524A_RAMDAC ((VENDOR_IBM << 16) | 0x01)
|
||||
#define IBM525_RAMDAC ((VENDOR_IBM << 16) | 0x02)
|
||||
|
|
|
@ -711,3 +711,7 @@ void TIramdacLoadPalette(
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
TIramdacLoadPaletteProc *TIramdacLoadPaletteWeak(void) {
|
||||
return TIramdacLoadPalette;
|
||||
}
|
||||
|
|
|
@ -19,6 +19,9 @@ void TIramdacHWCursorInit(xf86CursorInfoPtr infoPtr);
|
|||
void TIramdacLoadPalette( ScrnInfoPtr pScrn, int numColors, int *indices,
|
||||
LOCO *colors, VisualPtr pVisual);
|
||||
|
||||
typedef void TIramdacLoadPaletteProc(ScrnInfoPtr, int, int *, LOCO *,
|
||||
VisualPtr);
|
||||
TIramdacLoadPaletteProc *TIramdacLoadPaletteWeak(void);
|
||||
|
||||
#define TI3030_RAMDAC (VENDOR_TI << 16) | 0x00
|
||||
#define TI3026_RAMDAC (VENDOR_TI << 16) | 0x01
|
||||
|
|
|
@ -596,6 +596,9 @@ vgaHWProtect(ScrnInfoPtr pScrn, Bool on)
|
|||
}
|
||||
}
|
||||
|
||||
vgaHWProtectProc *vgaHWProtectWeak(void) {
|
||||
return vgaHWProtect;
|
||||
}
|
||||
|
||||
/*
|
||||
* vgaHWBlankScreen -- blank the screen.
|
||||
|
@ -620,6 +623,9 @@ vgaHWBlankScreen(ScrnInfoPtr pScrn, Bool on)
|
|||
vgaHWSeqReset(hwp, FALSE);
|
||||
}
|
||||
|
||||
vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void) {
|
||||
return vgaHWBlankScreen;
|
||||
}
|
||||
|
||||
/*
|
||||
* vgaHWSaveScreen -- blank the screen.
|
||||
|
|
|
@ -190,11 +190,16 @@ typedef struct _vgaHWRec {
|
|||
|
||||
/* vgaHW.c */
|
||||
|
||||
typedef void vgaHWProtectProc(ScrnInfoPtr, Bool);
|
||||
typedef void vgaHWBlankScreenProc(ScrnInfoPtr, Bool);
|
||||
|
||||
void vgaHWSetStdFuncs(vgaHWPtr hwp);
|
||||
void vgaHWSetMmioFuncs(vgaHWPtr hwp, CARD8 *base, int offset);
|
||||
void vgaHWProtect(ScrnInfoPtr pScrn, Bool on);
|
||||
vgaHWProtectProc *vgaHWProtectWeak(void);
|
||||
Bool vgaHWSaveScreen(ScreenPtr pScreen, int mode);
|
||||
void vgaHWBlankScreen(ScrnInfoPtr pScrn, Bool on);
|
||||
vgaHWBlankScreenProc *vgaHWBlankScreenWeak(void);
|
||||
void vgaHWSeqReset(vgaHWPtr hwp, Bool start);
|
||||
void vgaHWRestoreFonts(ScrnInfoPtr scrninfp, vgaRegPtr restore);
|
||||
void vgaHWRestoreMode(ScrnInfoPtr scrninfp, vgaRegPtr restore);
|
||||
|
|
|
@ -1653,7 +1653,8 @@ XAACachePlanarMonoStipple(ScrnInfoPtr pScrn, PixmapPtr pPix)
|
|||
return pCache;
|
||||
}
|
||||
|
||||
|
||||
XAACachePlanarMonoStippleProc *
|
||||
XAACachePlanarMonoStippleWeak(void) { return XAACachePlanarMonoStipple; }
|
||||
|
||||
XAACacheInfoPtr
|
||||
XAACacheStipple(ScrnInfoPtr pScrn, PixmapPtr pPix, int fg, int bg)
|
||||
|
|
|
@ -15,8 +15,10 @@ static CARD32* StippleOver32_Inverted(CARD32*, CARD32*, int, int, int);
|
|||
|
||||
#ifdef TRIPLE_BITS
|
||||
#define stipple_scanline_func EXPNAME(XAAStippleScanlineFunc3)
|
||||
#define stipple_get_scanline_func EXPNAME(XAAGetStippleScanlineFunc3)
|
||||
#else
|
||||
#define stipple_scanline_func EXPNAME(XAAStippleScanlineFunc)
|
||||
#define stipple_get_scanline_func EXPNAME(XAAGetStippleScanlineFunc)
|
||||
#endif
|
||||
|
||||
StippleScanlineProcPtr stipple_scanline_func[6] = {
|
||||
|
@ -28,6 +30,9 @@ StippleScanlineProcPtr stipple_scanline_func[6] = {
|
|||
StippleOver32_Inverted
|
||||
};
|
||||
|
||||
StippleScanlineProcPtr *stipple_get_scanline_func(void) {
|
||||
return stipple_scanline_func;
|
||||
}
|
||||
|
||||
#ifdef FIXEDBASE
|
||||
# define DEST(i) *dest
|
||||
|
|
|
@ -74,7 +74,7 @@ static CARD32 *DrawTETextScanlineWidth9(CARD32 *base, unsigned int **glyphp,
|
|||
#endif
|
||||
|
||||
#define glyph_scanline_func EXPNAME(XAAGlyphScanlineFunc)
|
||||
|
||||
#define glyph_get_scanline_func EXPNAME(XAAGetGlyphScanlineFunc)
|
||||
|
||||
|
||||
GlyphScanlineFuncPtr glyph_scanline_func[32] = {
|
||||
|
@ -125,6 +125,10 @@ GlyphScanlineFuncPtr glyph_scanline_func[32] = {
|
|||
DrawTETextScanlineGeneric, DrawTETextScanlineGeneric
|
||||
};
|
||||
|
||||
GlyphScanlineFuncPtr *glyph_get_scanline_func(void) {
|
||||
return glyph_scanline_func;
|
||||
}
|
||||
|
||||
|
||||
/********************************************************************
|
||||
|
||||
|
|
|
@ -727,6 +727,11 @@ extern CARD32 *(*XAAGlyphScanlineFuncLSBFirst[32])(
|
|||
CARD32 *base, unsigned int **glyphp, int line, int nglyph, int width
|
||||
);
|
||||
|
||||
GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncMSBFirstFixedBase(void);
|
||||
GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncMSBFirst(void);
|
||||
GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncLSBFirstFixedBase(void);
|
||||
GlyphScanlineFuncPtr *XAAGetGlyphScanlineFuncLSBFirst(void);
|
||||
|
||||
void
|
||||
XAAFillColorExpandRectsLSBFirst(
|
||||
ScrnInfoPtr pScrn,
|
||||
|
@ -1046,6 +1051,11 @@ extern CARD32 *(*XAAStippleScanlineFuncLSBFirst[6])(
|
|||
CARD32* base, CARD32* src, int offset, int width, int dwords
|
||||
);
|
||||
|
||||
StippleScanlineProcPtr *XAAGetStippleScanlineFuncMSBFirstFixedBase(void);
|
||||
StippleScanlineProcPtr *XAAGetStippleScanlineFuncMSBFirst(void);
|
||||
StippleScanlineProcPtr *XAAGetStippleScanlineFuncLSBFirstFixedBase(void);
|
||||
StippleScanlineProcPtr *XAAGetStippleScanlineFuncLSBFirst(void);
|
||||
|
||||
int
|
||||
XAAPolyText8TEColorExpansion(
|
||||
DrawablePtr pDraw,
|
||||
|
@ -1506,6 +1516,10 @@ XAACacheMonoStipple(ScrnInfoPtr Scrn, PixmapPtr pPix);
|
|||
XAACacheInfoPtr
|
||||
XAACachePlanarMonoStipple(ScrnInfoPtr Scrn, PixmapPtr pPix);
|
||||
|
||||
typedef XAACacheInfoPtr *XAACachePlanarMonoStippleProc(ScrnInfoPtr, PixmapPtr);
|
||||
|
||||
XAACachePlanarMonoStippleProc *XAAGetCachePlanarMonoStipple(void);
|
||||
|
||||
XAACacheInfoPtr
|
||||
XAACacheStipple(ScrnInfoPtr Scrn, PixmapPtr pPix, int fg, int bg);
|
||||
|
||||
|
|
|
@ -45,6 +45,7 @@
|
|||
#define mfbGetWindowPixmap xf1bppGetWindowPixmap
|
||||
#define mfbGetWindowPrivateIndex xf1bppGetWindowPrivateIndex
|
||||
#define mfbGetmask xf1bppGetmask
|
||||
#define mfbGetpartmasks xf1bppGetpartmasks
|
||||
#define mfbGetrmask xf1bppGetrmask
|
||||
#define mfbGetstarttab xf1bppGetstarttab
|
||||
#define mfbGetendtab xf1bppGetendtab
|
||||
|
|
|
@ -163,6 +163,13 @@ void
|
|||
shadowUpdateRotate32_270 (ScreenPtr pScreen,
|
||||
shadowBufPtr pBuf);
|
||||
|
||||
typedef void * shadowUpdateProc(ScreenPtr, shadowBufPtr);
|
||||
|
||||
shadowUpdateProc *shadowUpdatePackedWeak(void);
|
||||
shadowUpdateProc *shadowUpdatePlanar4Weak(void);
|
||||
shadowUpdateProc *shadowUpdatePlanar4x8Weak(void);
|
||||
shadowUpdateProc *shadowUpdateRotatePackedWeak(void);
|
||||
|
||||
void
|
||||
shadowWrapGC (GCPtr pGC);
|
||||
|
||||
|
|
|
@ -106,3 +106,5 @@ shadowUpdatePacked (ScreenPtr pScreen,
|
|||
pbox++;
|
||||
}
|
||||
}
|
||||
|
||||
shadowUpdateProc *shadowUpdatePackedWeak(void) { return shadowUpdatePacked; }
|
||||
|
|
|
@ -165,4 +165,11 @@ shadowUpdatePlanar4 (ScreenPtr pScreen,
|
|||
pbox++;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
shadowUpdateProc *shadowUpdatePlanar4Weak(void) {
|
||||
return shadowUpdatePlanar4;
|
||||
}
|
||||
|
||||
shadowUpdateProc *shadowUpdatePlanar4x8Weak(void) {
|
||||
return shadowUpdatePlanar4x8;
|
||||
}
|
||||
|
|
|
@ -304,3 +304,7 @@ shadowUpdateRotatePacked (ScreenPtr pScreen,
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
shadowUpdateProc *shadowUpdateRotatePackedWeak(void) {
|
||||
return shadowUpdateRotatePacked;
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user