diff options
| author | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:23:35 +0000 |
|---|---|---|
| committer | Eric Anholt <anholt@freebsd.org> | 2004-06-16 09:23:35 +0000 |
| commit | 2511a34d2733cb50de81085e806f563220a23149 (patch) | |
| tree | 748fb00f9222cbae1ecd8fd51d78be820e8b5fb8 /src/savage_accel.c | |
| parent | b860272eefbe9b72986d669017afd615d6477433 (diff) | |
DRI XFree86-4_3_99_12-merge importDRI-XFree86-4_3_99_12-merge
Diffstat (limited to 'src/savage_accel.c')
| -rw-r--r-- | src/savage_accel.c | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/src/savage_accel.c b/src/savage_accel.c index e995a6e..b0ea828 100644 --- a/src/savage_accel.c +++ b/src/savage_accel.c @@ -1,4 +1,4 @@ -/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c,v 1.23 2003/12/22 17:48:10 tsi Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/savage/savage_accel.c,v 1.21 2003/08/04 10:32:26 eich Exp $ */ /* * @@ -66,7 +66,6 @@ static void SavageSubsequentSolidBresenhamLine( int length, int octant); -#if 0 static void SavageSubsequentSolidTwoPointLine( ScrnInfoPtr pScrn, int x1, @@ -74,7 +73,6 @@ static void SavageSubsequentSolidTwoPointLine( int x2, int y2, int bias); -#endif #if 0 static void SavageSetupForScreenToScreenColorExpand( @@ -130,7 +128,6 @@ static void SavageSubsequentMono8x8PatternFillRect( int w, int h); -#if 0 static void SavageSetupForColor8x8PatternFill( ScrnInfoPtr pScrn, int patternx, @@ -147,7 +144,6 @@ static void SavageSubsequentColor8x8PatternFillRect( int y, int w, int h); -#endif static void SavageSetClippingRectangle( ScrnInfoPtr pScrn, @@ -488,6 +484,7 @@ SavageInitAccel(ScreenPtr pScreen) xaaptr->SolidLineFlags = NO_PLANEMASK | ROP_NEEDS_SOURCE; xaaptr->SetupForSolidLine = SavageSetupForSolidFill; xaaptr->SubsequentSolidBresenhamLine = SavageSubsequentSolidBresenhamLine; + xaaptr->SubsequentSolidTwoPointLine = SavageSubsequentSolidTwoPointLine; #if 0 xaaptr->SubsequentSolidFillTrap = SavageSubsequentSolidFillTrap; #endif @@ -992,7 +989,6 @@ SavageSubsequentMono8x8PatternFillRect( } -#if 0 static void SavageSetupForColor8x8PatternFill( ScrnInfoPtr pScrn, @@ -1005,6 +1001,7 @@ SavageSetupForColor8x8PatternFill( SavagePtr psav = SAVPTR(pScrn); int cmd; + int mix; unsigned int bd; int pat_offset; @@ -1016,7 +1013,7 @@ SavageSetupForColor8x8PatternFill( cmd = BCI_CMD_RECT | BCI_CMD_RECT_XP | BCI_CMD_RECT_YP | BCI_CMD_DEST_GBD | BCI_CMD_PAT_PBD_COLOR_NEW; - (void) XAAHelpSolidROP( pScrn, &trans_col, planemask, &rop ); + mix = XAAHelpSolidROP( pScrn, &trans_col, planemask, &rop ); BCI_CMD_SET_ROP(cmd, rop); bd = BCI_BD_BW_DISABLE; @@ -1053,7 +1050,6 @@ SavageSubsequentColor8x8PatternFillRect( BCI_SEND(BCI_X_Y(x, y)); BCI_SEND(BCI_W_H(w, h)); } -#endif static void @@ -1093,7 +1089,6 @@ SavageSubsequentSolidBresenhamLine( } -#if 0 static void SavageSubsequentSolidTwoPointLine( ScrnInfoPtr pScrn, @@ -1153,7 +1148,6 @@ SavageSubsequentSolidTwoPointLine( BCI_SEND( BCI_LINE_STEPS( 2 * (min - max), 2 * min ) ); BCI_SEND( BCI_LINE_MISC( max, ym, xp, yp, 2 * min - max ) ); } -#endif |