summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKaleb Keithley <kaleb@freedesktop.org>2003-12-19 20:55:11 +0000
committerKaleb Keithley <kaleb@freedesktop.org>2003-12-19 20:55:11 +0000
commite98acf72d990777d4b0afa42b42bb90edcf6de3e (patch)
tree2215c526c612e667f52e3f46c17f245816d865c9
parentae25b306d5f2e46a7ff9971957bc1005d01e7d45 (diff)
XFree86 4.3.99.902 (RC 2)xf86-4_3_99_902
-rw-r--r--src/nsc_gx1_accel.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/src/nsc_gx1_accel.c b/src/nsc_gx1_accel.c
index 3f7fce9..1a1244b 100644
--- a/src/nsc_gx1_accel.c
+++ b/src/nsc_gx1_accel.c
@@ -1,4 +1,4 @@
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c,v 1.6 2003/11/03 05:11:20 tsi Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/nsc/nsc_gx1_accel.c,v 1.8 2003/12/07 23:18:16 alanh Exp $ */
/*
* $Workfile: nsc_gx1_accel.c $
* $Revision$
@@ -273,9 +273,11 @@ void OPTGX1SubsequentBresenhamLine(ScrnInfoPtr pScreenInfo, int x1, int y1,
void OPTGX1SubsequentSolidTwoPointLine(ScrnInfoPtr pScreenInfo,
int x0, int y0, int x1, int y1,
int flags);
+#if 0 /* disabled due to bugs */
void OPTGX1SubsequentHorVertLine(ScrnInfoPtr pScreenInfo, int x, int y,
int len, int dir);
+#endif
void OPTGX1SetupForScanlineImageWrite(ScrnInfoPtr pScreenInfo,
int rop, unsigned int planemask,
int transparency_color, int bpp,
@@ -1607,6 +1609,7 @@ OPTGX1SubsequentSolidTwoPointLine(ScrnInfoPtr pScreenInfo,
WRITE_REG16(GP_VECTOR_MODE, (Geode_vector_mode | vec_flags));
}
+#if 0 /* disabled due to bugs - can't fallback to fillrectsolid */
/*---------------------------------------------------------------------------
* OPTGX1SubsequentHorVertLine
*
@@ -1634,6 +1637,7 @@ OPTGX1SubsequentHorVertLine(ScrnInfoPtr pScreenInfo,
len));
}
#endif
+#endif
/*----------------------------------------------------------------------------
* GX1AccelInit.
@@ -1738,8 +1742,10 @@ GX1AccelInit(ScreenPtr pScreen)
localRecPtr->SetupForSolidLine = OPTACCEL(GX1SetupForSolidLine);
localRecPtr->SubsequentSolidBresenhamLine =
OPTACCEL(GX1SubsequentBresenhamLine);
+#if !defined(OPT_ACCEL)
localRecPtr->SubsequentSolidHorVertLine =
OPTACCEL(GX1SubsequentHorVertLine);
+#endif
localRecPtr->SubsequentSolidTwoPointLine =
OPTACCEL(GX1SubsequentSolidTwoPointLine);
localRecPtr->SolidBresenhamLineErrorTermBits = 15;