diff options
Diffstat (limited to 'xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c')
| -rw-r--r-- | xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c b/xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c index 9f27356d9..2e0c8ae2c 100644 --- a/xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c +++ b/xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c,v 1.11 2002/01/11 15:37:32 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sis/sis300_accel.c,v 1.12 2002/04/04 14:05:47 eich Exp $ */ /* * @@ -774,13 +774,12 @@ SiSSetupForScanlineCPUToScreenColorExpandFill(ScrnInfoPtr pScrn, int fg, int bg, }; } -static int srcpitch; -static int xcurrent, ycurrent; static void SiSSubsequentScanlineCPUToScreenColorExpandFill( ScrnInfoPtr pScrn, int x, int y, int w, int h, int skipleft) { SISPtr pSiS = SISPTR(pScrn); +static int srcpitch; int _x0, _y0, _x1, _y1; long dstbase; @@ -803,8 +802,8 @@ static void SiSSubsequentScanlineCPUToScreenColorExpandFill( SiSSetupRect(w, 1); srcpitch = ((((w+7)/8)+3) >> 2) * 4; SiSSetupSRCPitch(srcpitch); - ycurrent = y; - xcurrent = x; + pSiS->ycurrent = y; + pSiS->xcurrent = x; } static void SiSSubsequentColorExpandScanline(ScrnInfoPtr pScrn, int bufno) @@ -813,8 +812,8 @@ static void SiSSubsequentColorExpandScanline(ScrnInfoPtr pScrn, int bufno) int newhead,bltbufstage,newtail; SiSSetupSRCBase(pSiS->ColorExpandBufferScreenOffset[bufno]); - SiSSetupDSTXY(xcurrent, ycurrent); - ycurrent++; + SiSSetupDSTXY(pSiS->xcurrent, pSiS->ycurrent); + pSiS->ycurrent++; SiSDoCMD newhead = pSiS->ColorExpandRingHead = (bufno + 1) & pSiS->ColorExpandBufferCountMask; |