diff options
| author | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:02 +0000 |
|---|---|---|
| committer | Alexander Gottwald <alexander.gottwald@s1999.tu-chemnitz.de> | 2004-09-15 16:34:02 +0000 |
| commit | 11f33224f86463f74822922c33f10207df818986 (patch) | |
| tree | 07af96549f5041695bb35d2621438a330fe061d7 /src/riva_driver.c | |
| parent | d12cb6d98b8045677d3730d02ebfc1ceace8981f (diff) | |
Pull XORG-6_8_0 to CYGWIN branchCYGWIN-6_8_1-MERGECYGWIN-6_8_0-MERGE
Diffstat (limited to 'src/riva_driver.c')
| -rw-r--r-- | src/riva_driver.c | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/src/riva_driver.c b/src/riva_driver.c index daf7b9c..e11772a 100644 --- a/src/riva_driver.c +++ b/src/riva_driver.c @@ -88,12 +88,12 @@ static const char *fbSymbols[] = { }; static const char *xaaSymbols[] = { - "XAACopyROP", + "XAAGetCopyROP", "XAACreateInfoRec", "XAADestroyInfoRec", - "XAAFallbackOps", + "XAAGetFallbackOps", "XAAInit", - "XAAPatternROP", + "XAAGetPatternROP", NULL }; @@ -138,16 +138,16 @@ static const char *fbdevHWSymbols[] = { "fbdevHWGetVidmem", /* colormap */ - "fbdevHWLoadPalette", + "fbdevHWLoadPaletteWeak", /* ScrnInfo hooks */ - "fbdevHWAdjustFrame", + "fbdevHWAdjustFrameWeak", "fbdevHWEnterVT", - "fbdevHWLeaveVT", + "fbdevHWLeaveVTWeak", "fbdevHWModeInit", "fbdevHWSave", - "fbdevHWSwitchMode", - "fbdevHWValidMode", + "fbdevHWSwitchModeWeak", + "fbdevHWValidModeWeak", "fbdevHWMapMMIO", "fbdevHWMapVidmem", @@ -172,7 +172,7 @@ static XF86ModuleVersionInfo rivaVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, RIVA_MAJOR_VERSION, RIVA_MINOR_VERSION, RIVA_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, @@ -688,11 +688,11 @@ RivaPreInit(ScrnInfoPtr pScrn, int flags) xf86FreeInt10(pRiva->pInt); return FALSE; } - pScrn->SwitchMode = fbdevHWSwitchMode; - pScrn->AdjustFrame = fbdevHWAdjustFrame; + pScrn->SwitchMode = fbdevHWSwitchModeWeak(); + pScrn->AdjustFrame = fbdevHWAdjustFrameWeak(); pScrn->EnterVT = RivaEnterVTFBDev; - pScrn->LeaveVT = fbdevHWLeaveVT; - pScrn->ValidMode = fbdevHWValidMode; + pScrn->LeaveVT = fbdevHWLeaveVTWeak(); + pScrn->ValidMode = fbdevHWValidModeWeak(); } pRiva->Rotate = 0; if ((s = xf86GetOptValString(pRiva->Options, OPTION_ROTATE))) { @@ -1317,7 +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 ? fbdevHWLoadPalette : Rivadac->LoadPalette), + (pRiva->FBDev ? fbdevHWLoadPaletteWeak() : Rivadac->LoadPalette), NULL, CMAP_RELOAD_ON_MODE_SWITCH | CMAP_PALETTED_TRUECOLOR)) return FALSE; |