diff options
| author | dawes <dawes> | 2001-06-14 23:31:26 +0000 |
|---|---|---|
| committer | dawes <dawes> | 2001-06-14 23:31:26 +0000 |
| commit | 2998ca08b5d7b5a8217f393eb6a82aecbb8a6370 (patch) | |
| tree | 73605be48c7a6634a25ad7720491e80c91e75824 | |
| parent | a9af1066d2bdb2fdeba01fa0e632c8a84252c890 (diff) | |
2nd part of 4.1.0 merge.X_4_1_0-20010615-merge
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c | 3 | ||||
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c | 6 |
2 files changed, 0 insertions, 9 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c index 556df4134..b8e40cb93 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_driver.c @@ -1909,9 +1909,6 @@ TDFXScreenInit(int scrnIndex, ScreenPtr pScreen, int argc, char **argv) { return FALSE; } - pTDFX->pixmapCacheLinesMax = ((pScrn->videoRam<<10) - - (pScrn->virtualY * pTDFX->stride)) / 1024; - scanlines = (pTDFX->backOffset - pTDFX->fbOffset) / pTDFX->stride; if(pTDFX->ChipType < PCI_CHIP_VOODOO5) { if (scanlines > 2047) diff --git a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c index ba3d44d8c..80a4e4205 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c @@ -1,10 +1,5 @@ /* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tdfx/tdfx_video.c,v 1.10.2.1 2001/05/22 21:25:45 dawes Exp $ */ -#ifndef XvExtension -void TDFXInitVideo(ScreenPtr pScreen) {} -void TDFXCloseVideo(ScreenPtr pScreen) {} -#else - #include "xf86.h" #include "tdfx.h" #include "dixstruct.h" @@ -176,7 +171,6 @@ TDFXAllocAdaptor(ScrnInfoPtr pScrn, int numberPorts) XF86VideoAdaptorPtr adapt; TDFXPtr pTDFX = TDFXPTR(pScrn); TDFXPortPrivPtr pPriv; - int i; if(!(adapt = xf86XVAllocateVideoAdaptorRec(pScrn))) return NULL; |