XLibre/xf86-video-nv
1
0
Fork 0
mirror of https://github.com/X11Libre/xf86-video-nv.git synced 2026-03-24 01:24:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change several LoaderSymbol calls introduced by the bug #400 patch to

Browse Source 
*Weak() resolver functions.
This commit is contained in:
Adam Jackson
2004-07-31 01:21:19 +00:00
parent f745157f15
commit 8b6de7d388
2 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/nv_driver.c
View File

@@ -1,4 +1,4 @@
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.2 2004/04/23 19:42:10 eich Exp $ */
/* $XdotOrg: xc/programs/Xserver/hw/xfree86/drivers/nv/nv_driver.c,v 1.3 2004/07/30 20:30:53 ajax Exp $ */
/* $XConsortium: nv_driver.c /main/3 1996/10/28 05:13:37 kaleb $ */
/*
* Copyright 1996-1997 David J. McKay
@@ -1053,11 +1053,11 @@ NVPreInit(ScrnInfoPtr pScrn, int flags)
xf86FreeInt10(pNv->pInt);
return FALSE;
}
pScrn->SwitchMode = LoaderSymbol("fbdevHWSwitchMode");
pScrn->AdjustFrame = LoaderSymbol("fbdevHWAdjustFrame");
pScrn->SwitchMode = fbdevHWSwitchModeWeak();
pScrn->AdjustFrame = fbdevHWAdjustFrameWeak();
pScrn->EnterVT = NVEnterVTFBDev;
pScrn->LeaveVT = LoaderSymbol("fbdevHWLeaveVT");
pScrn->ValidMode = LoaderSymbol("fbdevHWValidMode");
pScrn->LeaveVT = fbdevHWLeaveVTWeak();
pScrn->ValidMode = fbdevHWValidModeWeak();
}
pNv->Rotate = 0;
if ((s = xf86GetOptValString(pNv->Options, OPTION_ROTATE))) {
@@ -1765,7 +1765,7 @@ NVScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
/* Initialize colormap layer.
Must follow initialization of the default colormap */
if(!xf86HandleColormaps(pScreen, 256, 8,
(pNv->FBDev ? LoaderSymbol("fbdevHWLoadPalette") : NVDACLoadPalette),
(pNv->FBDev ? fbdevHWLoadPaletteWeak() : NVDACLoadPalette),
NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR))
return FALSE;

11
src/riva_driver.c
View File

@@ -688,11 +688,11 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags)
xf86FreeInt10(pRiva->pInt);
return FALSE;
}
pScrn->SwitchMode = LoaderSymbol("fbdevHWSwitchMode");
pScrn->AdjustFrame = LoaderSymbol("fbdevHWAdjustFrame");
pScrn->SwitchMode = fbdevHWSwitchModeWeak();
pScrn->AdjustFrame = fbdevHWAdjustFrameWeak();
pScrn->EnterVT = RivaEnterVTFBDev;
pScrn->LeaveVT = LoaderSymbol("fbdevHWLeaveVT");
pScrn->ValidMode = LoaderSymbol("fbdevHWValidMode");
pScrn->LeaveVT = fbdevHWLeaveVTWeak();
pScrn->ValidMode = fbdevHWValidModeWeak();
}
pRiva->Rotate = 0;
if ((s = xf86GetOptValString(pRiva->Options, OPTION_ROTATE))) {
@@ -1317,8 +1317,7 @@ RivaScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv)
/* Initialize colormap layer.
Must follow initialization of the default colormap */
if(!xf86HandleColormaps(pScreen, 256, 8,
(pRiva->FBDev ? LoaderSymbol("fbdevHWLoadPalette")
: Rivadac->LoadPalette),
(pRiva->FBDev ? fbdevHWLoadPaletteWeak() : Rivadac->LoadPalette),
NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR))
return FALSE;