diff options
| author | Adam Jackson <ajax@nwnk.net> | 2004-07-30 20:30:55 +0000 |
|---|---|---|
| committer | Adam Jackson <ajax@nwnk.net> | 2004-07-30 20:30:55 +0000 |
| commit | 7651737b93dfbf91fc84074e2a785623fc05c4b4 (patch) | |
| tree | afe87890e5d9a3a59cd6137f706960b1d844eff5 | |
| parent | 9eac6dfabcd20c990fdc1e71c1eb6de06c87af26 (diff) | |
Bug #400 (partial): Driver fixes for the dlloader. When using dlloader, allrel-0-6-1lg3d-rel-0-7-0lg3d-rel-0-6-2lg3d-baseXORG-6_8_2XORG-6_8_1_904XORG-6_8_1_903XORG-6_8_1_902XORG-6_8_1_901XORG-6_8_1XORG-6_8_0XORG-6_7_99_904XORG-6_7_99_903XORG-6_7_99_902XORG-6_7_99_901XORG-6_7_99_2XORG-6_7_99_1XORG-6_8-branch
framebuffer formats except cfb and the overlay modes should work, and
r128 and radeon need to be loaded from the ati driver (both issues to
be fixed soon). Tested on i740, s3virge, mach64, tdfx, vesa, and vga
drivers. elfloader users shouldn't be affected.
| -rw-r--r-- | src/tga_driver.c | 15 | ||||
| -rw-r--r-- | src/tga_line.c | 4 |
2 files changed, 9 insertions, 10 deletions
diff --git a/src/tga_driver.c b/src/tga_driver.c index f8aa514..6926eb2 100644 --- a/src/tga_driver.c +++ b/src/tga_driver.c @@ -22,7 +22,7 @@ * Authors: Alan Hourihane, <alanh@fairlite.demon.co.uk> * Matthew Grossman, <mattg@oz.net> - acceleration and misc fixes */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c,v 1.59 2003/04/23 21:51:48 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_driver.c,v 1.60tsi Exp $ */ /* everybody includes these */ #include "xf86.h" @@ -90,8 +90,8 @@ static void TGAAdjustFrame(int scrnIndex, int x, int y, int flags); /* Optional functions */ static void TGAFreeScreen(int scrnIndex, int flags); -static int TGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, - int flags); +static ModeStatus TGAValidMode(int scrnIndex, DisplayModePtr mode, + Bool verbose, int flags); /* Internally used functions */ static Bool TGAMapMem(ScrnInfoPtr pScrn); @@ -189,7 +189,7 @@ static const char *ramdacSymbols[] = { static const char *xaaSymbols[] = { "XAACreateInfoRec", "XAADestroyInfoRec", - "XAAGCIndex", + "XAAGetGCIndex", "XAAInit", NULL }; @@ -210,7 +210,7 @@ static XF86ModuleVersionInfo tgaVersRec = MODULEVENDORSTRING, MODINFOSTRING1, MODINFOSTRING2, - XF86_VERSION_CURRENT, + XORG_VERSION_CURRENT, TGA_MAJOR_VERSION, TGA_MINOR_VERSION, TGA_PATCHLEVEL, ABI_CLASS_VIDEODRV, /* This is a video driver */ ABI_VIDEODRV_VERSION, @@ -1498,10 +1498,9 @@ TGAEnterVT(int scrnIndex, int flags) static void TGALeaveVT(int scrnIndex, int flags) { - TGAPtr pTga; ScrnInfoPtr pScrn = xf86Screens[scrnIndex]; +/* TGAPtr pTga = TGAPTR(pScrn); */ - pTga = TGAPTR(pScrn); TGARestore(pScrn); /* no longer necessary with new VT switching code */ @@ -1550,7 +1549,7 @@ TGAFreeScreen(int scrnIndex, int flags) /* Checks if a mode is suitable for the selected chipset. */ /* Optional */ -static int +static ModeStatus TGAValidMode(int scrnIndex, DisplayModePtr mode, Bool verbose, int flags) { if (mode->Flags & V_INTERLACE) diff --git a/src/tga_line.c b/src/tga_line.c index b1a510c..49c62fe 100644 --- a/src/tga_line.c +++ b/src/tga_line.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/tga/tga_line.c,v 1.2 1999/12/16 02:26:30 robin Exp $ */ +/* $XFree86: $ */ /* * Copyright 1999 by Matthew Grossman, Seattle, USA. @@ -413,7 +413,7 @@ TGAPolySegment( #endif ){ XAAInfoRecPtr infoRec = GET_XAAINFORECPTR_FROM_GC(pGC); - XAAGCPtr pGCPriv = (XAAGCPtr) (pGC)->devPrivates[XAAGCIndex].ptr; + XAAGCPtr pGCPriv = (XAAGCPtr) (pGC)->devPrivates[XAAGetGCIndex()].ptr; BoxPtr pboxInit = REGION_RECTS(pGC->pCompositeClip); int nboxInit = REGION_NUM_RECTS(pGC->pCompositeClip); unsigned int bias = miGetZeroLineBias(pDrawable->pScreen); |