summaryrefslogtreecommitdiff
path: root/hw/kdrive/savage/s3gc.c
diff options
context:
space:
mode:
authorDavid Dawes <dawes@xfree86.org>2000-01-21 01:12:02 +0000
committerDavid Dawes <dawes@xfree86.org>2000-01-21 01:12:02 +0000
commit306ac1db85c30a796c9a69c639e7f2e4efd98d50 (patch)
tree549ab14cbfa433c7d06603a30c1edb57a45bddf7 /hw/kdrive/savage/s3gc.c
parent6d978d21b0bea6c73b65f2f47c68de4b94dd73c4 (diff)
3554. Fix "controlization" in XLookupString for chars > 127 (#3569, Ivan
Pascal). 3553. Take advantage of FB speedups in Tiny-X (#3568, Keith Packard). 3552. Speed up FB and do 32bit accesses instead of 64bit accesses (#3567, Keith Packard). 3551. Eliminate saving the contents of the screen durint VT switching (#3562, Keith Packard). 3550. Make using fb easier for driver writers (#3561, Keith Packard). 3549. Fix TCP font server connections (#3560, Keith Packard). 3548. Implement the "OverclockMem" option for the Millennium and Millennium II (#3558, Andrew Aitchison). 3547. Speed up some FB performance problems (#3557, 3559, 3560, Keith Packard). 3546. Work around a bad code generation bug in gcc 2.7.2.3 that shows up in XAA (#3550, Rik Faith). 3545. Add a -brief option to xclock to show only hours and minutes when in digital mode (#3549, Keith Packard). 3544. Fix some dead key problems with xkb symbols for Swiss French and Swiss German keyboards (#3546, Charles Lopes).
Diffstat (limited to 'hw/kdrive/savage/s3gc.c')
-rw-r--r--hw/kdrive/savage/s3gc.c20
1 files changed, 10 insertions, 10 deletions
diff --git a/hw/kdrive/savage/s3gc.c b/hw/kdrive/savage/s3gc.c
index d62db68ae..acc4c9909 100644
--- a/hw/kdrive/savage/s3gc.c
+++ b/hw/kdrive/savage/s3gc.c
@@ -22,7 +22,7 @@
*
* Author: Keith Packard, SuSE, Inc.
*/
-/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3gc.c,v 1.1 1999/11/19 13:53:56 hohndel Exp $ */
+/* $XFree86: xc/programs/Xserver/hw/kdrive/savage/s3gc.c,v 1.2 1999/12/30 03:03:12 robin Exp $ */
#include "s3.h"
#include "s3draw.h"
@@ -57,7 +57,7 @@ static const GCOps s3TEOps1Rect = {
KdCheckPolyPoint,
s3Polylines,
s3PolySegment,
- miPolyRectangle,
+ KdCheckPolyRectangle,
KdCheckPolyArc,
s3FillPoly1Rect,
s3PolyFillRect,
@@ -86,7 +86,7 @@ static const GCOps s3NonTEOps1Rect = {
KdCheckPolyPoint,
s3Polylines,
s3PolySegment,
- miPolyRectangle,
+ KdCheckPolyRectangle,
KdCheckPolyArc,
s3FillPoly1Rect,
s3PolyFillRect,
@@ -113,9 +113,9 @@ static const GCOps s3TEOps = {
KdCheckPolyPoint,
s3Polylines,
s3PolySegment,
- miPolyRectangle,
+ KdCheckPolyRectangle,
KdCheckPolyArc,
- miFillPolygon,
+ KdCheckFillPolygon,
s3PolyFillRect,
s3PolyFillArcSolid,
miPolyText8,
@@ -140,9 +140,9 @@ static const GCOps s3NonTEOps = {
KdCheckPolyPoint,
s3Polylines,
s3PolySegment,
- miPolyRectangle,
+ KdCheckPolyRectangle,
KdCheckPolyArc,
- miFillPolygon,
+ KdCheckFillPolygon,
s3PolyFillRect,
s3PolyFillArcSolid,
miPolyText8,
@@ -321,7 +321,7 @@ s3ValidateGC (GCPtr pGC, Mask changes, DrawablePtr pDrawable)
if (new_type || (changes & (GCLineStyle|GCLineWidth|GCFillStyle)))
{
pGC->ops->Polylines = KdCheckPolylines;
- pGC->ops->PolySegment = miPolySegment;
+ pGC->ops->PolySegment = KdCheckPolySegment;
if (pGC->lineStyle == LineSolid &&
pGC->lineWidth == 0 &&
pGC->fillStyle == FillSolid &&
@@ -337,7 +337,7 @@ s3ValidateGC (GCPtr pGC, Mask changes, DrawablePtr pDrawable)
*/
if (new_type || new_onerect || (changes & (GCFillStyle)))
{
- pGC->ops->FillPolygon = miFillPolygon;
+ pGC->ops->FillPolygon = KdCheckFillPolygon;
if (s3Priv->type == DRAWABLE_WINDOW &&
fbPriv->oneRect &&
pGC->fillStyle == FillSolid)
@@ -351,7 +351,7 @@ s3ValidateGC (GCPtr pGC, Mask changes, DrawablePtr pDrawable)
*/
if (new_type || (changes & GCFillStyle))
{
- pGC->ops->PolyFillArc = miPolyFillArc;
+ pGC->ops->PolyFillArc = KdCheckPolyFillArc;
if (s3Priv->type == DRAWABLE_WINDOW &&
pGC->fillStyle == FillSolid)
{