Remove remaining cfb-isms and dead accel code.

1 files changed, 0 insertions, 200 deletions

diff --git a/src/ffb_seg.c b/src/ffb_seg.c
deleted file mode 100644
index 9be630a..0000000
--- a/src/ffb_seg.c
+++ /dev/null
@@ -1,200 +0,0 @@
-/*
- * Acceleration for the Creator and Creator3D framebuffer - Segment rops.
- *
- * Copyright (C) 1998,1999,2000 Jakub Jelinek (jakub@redhat.com)
- * Copyright (C) 1999 David S. Miller (davem@redhat.com)
- *
- * Permission is hereby granted, free of charge, to any person obtaining a copy
- * of this software and associated documentation files (the "Software"), to deal
- * in the Software without restriction, including without limitation the rights
- * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
- * copies of the Software, and to permit persons to whom the Software is
- * furnished to do so, subject to the following conditions:
- *
- * The above copyright notice and this permission notice shall be included in
- * all copies or substantial portions of the Software.
- *
- * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
- * JAKUB JELINEK OR DAVID MILLER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
- * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
- * IN THE SOFTWARE.
- *
- */
-/* $XFree86: xc/programs/Xserver/hw/xfree86/drivers/sunffb/ffb_seg.c,v 1.1 2000/05/18 23:21:37 dawes Exp $ */
-
-#ifdef HAVE_CONFIG_H
-#include "config.h"
-#endif
-
-#include "ffb.h"
-#include "ffb_regs.h"
-#include "ffb_rcache.h"
-#include "ffb_fifo.h"
-#include "ffb_loops.h"
-#include "ffb_stip.h"
-
-#include "pixmapstr.h"
-#include "scrnintstr.h"
-
-#define PSZ 8
-#include "cfb.h"
-#undef PSZ
-#include "cfb32.h"
-
-#include "miline.h"
-
-/* The general strategy is to do the drawing completely in hardware
- * iff:
- * 1) Single region rect
- * 2) Both ends of the segment lie within it
- */
-#define SEG_DRAWOP(__pgc) ((__pgc)->capStyle == CapNotLast ? \
-			   FFB_DRAWOP_BRLINEOPEN : \
-			   FFB_DRAWOP_BRLINECAP)
-static void
-ReloadSegmentAttrs(FFBPtr pFfb, CreatorPrivGCPtr gcPriv, GCPtr pGC, WindowPtr pWin)
-{
-	if(gcPriv->stipple == NULL) {
-		FFB_ATTR_GC(pFfb, pGC, pWin,
-			    FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST,
-			    SEG_DRAWOP(pGC));
-	} else {
-		ffb_fbcPtr ffb = pFfb->regs;
-		unsigned int fbc;
-
-		FFBSetStipple(pFfb, ffb, gcPriv->stipple,
-			      FFB_PPC_CS_CONST, FFB_PPC_CS_MASK);
-		FFB_WRITE_PMASK(pFfb, ffb, pGC->planemask);
-		FFB_WRITE_DRAWOP(pFfb, ffb, SEG_DRAWOP(pGC));
-		fbc = FFB_FBC_WIN(pWin);
-		fbc = (fbc & ~FFB_FBC_XE_MASK) | FFB_FBC_XE_OFF;
-		FFB_WRITE_FBC(pFfb, ffb, fbc);
-	}
-}
-
-void
-CreatorPolySegment (DrawablePtr pDrawable, GCPtr pGC, int nseg, xSegment *pSeg)
-{
-	WindowPtr pWin = (WindowPtr) pDrawable;
-	CreatorPrivGCPtr gcPriv = CreatorGetGCPrivate (pGC);
-	FFBPtr pFfb = GET_FFB_FROM_SCREEN (pGC->pScreen);
-	ffb_fbcPtr ffb = pFfb->regs;
-	BoxPtr extent;
-	int xorg, yorg, lpat;
-
-	if (nseg == 0)
-		return;
-
-	FFBLOG(("CreatorPolySegment: ALU(%x) PMSK(%08x) nseg(%d) lpat(%08x)\n",
-		pGC->alu, pGC->planemask, nseg, gcPriv->linepat));
-
-	if (gcPriv->stipple == NULL) {
-		FFB_ATTR_GC(pFfb, pGC, pWin,
-			    FFB_PPC_APE_DISABLE | FFB_PPC_CS_CONST,
-			    SEG_DRAWOP(pGC));
-	} else {
-		unsigned int fbc;
-
-		FFBSetStipple(pFfb, ffb, gcPriv->stipple,
-			      FFB_PPC_CS_CONST, FFB_PPC_CS_MASK);
-		FFB_WRITE_PMASK(pFfb, ffb, pGC->planemask);
-		FFB_WRITE_DRAWOP(pFfb, ffb, SEG_DRAWOP(pGC));
-		fbc = FFB_FBC_WIN(pWin);
-		fbc = (fbc & ~FFB_FBC_XE_MASK) | FFB_FBC_XE_OFF;
-		FFB_WRITE_FBC(pFfb, ffb, fbc);
-	}
-
-	pFfb->rp_active = 1;
-	xorg = pDrawable->x;
-	yorg = pDrawable->y;
-	extent = REGION_RECTS(cfbGetCompositeClip(pGC));
-	lpat = gcPriv->linepat;
-
-	if (lpat == 0) {
-		FFBFifo(pFfb, 1);
-		ffb->lpat = 0;
-		if (pFfb->has_brline_bug) {
-			while (nseg--) {
-				register int x1 = pSeg->x1 + xorg;
-				register int y1 = pSeg->y1 + yorg;
-				register int x2 = pSeg->x2 + xorg;
-				register int y2 = pSeg->y2 + yorg;
-
-				if (x1 >= extent->x1	&&
-				    x2 >= extent->x1	&&
-				    x1 < extent->x2	&&
-				    x2 < extent->x2	&&
-				    y1 >= extent->y1	&&
-				    y2 >= extent->y1	&&
-				    y1 < extent->y2	&&
-				    y2 < extent->y2) {
-					FFBFifo(pFfb, 5);
-					ffb->ppc = 0;
-					FFB_WRITE64(&ffb->by, y1, x1);
-					FFB_WRITE64_2(&ffb->bh, y2, x2);
-				} else {
-					gcPriv->PolySegment(pDrawable, pGC, 1, pSeg);
-					ReloadSegmentAttrs(pFfb, gcPriv, pGC, pWin);
-					pFfb->rp_active = 1;
-				}
-				pSeg++;
-			}
-		} else {
-			while (nseg--) {
-				register int x1 = pSeg->x1 + xorg;
-				register int y1 = pSeg->y1 + yorg;
-				register int x2 = pSeg->x2 + xorg;
-				register int y2 = pSeg->y2 + yorg;
-
-				if (x1 >= extent->x1	&&
-				    x2 >= extent->x1	&&
-				    x1 < extent->x2	&&
-				    x2 < extent->x2	&&
-				    y1 >= extent->y1	&&
-				    y2 >= extent->y1	&&
-				    y1 < extent->y2	&&
-				    y2 < extent->y2) {
-					FFBFifo(pFfb, 4);
-					FFB_WRITE64(&ffb->by, y1, x1);
-					FFB_WRITE64_2(&ffb->bh, y2, x2);
-				} else {
-					gcPriv->PolySegment(pDrawable, pGC, 1, pSeg);
-					ReloadSegmentAttrs(pFfb, gcPriv, pGC, pWin);
-					pFfb->rp_active = 1;
-				}
-				pSeg++;
-			}
-		}
-	} else {
-		/* No reason to optimize the non-brline bug case since
-		 * we have to write the line pattern register each loop
-		 * anyways.
-		 */
-		while (nseg--) {
-			register int x1 = pSeg->x1 + xorg;
-			register int y1 = pSeg->y1 + yorg;
-			register int x2 = pSeg->x2 + xorg;
-			register int y2 = pSeg->y2 + yorg;
-
-			if (x1 >= extent->x1	&&	x2 >= extent->x1	&&
-			    x1 < extent->x2	&&	x2 < extent->x2		&&
-			    y1 >= extent->y1	&&	y2 >= extent->y1	&&
-			    y1 < extent->y2	&&	y2 < extent->y2) {
-				FFBFifo(pFfb, 5);
-				ffb->lpat = lpat;
-				FFB_WRITE64(&ffb->by, y1, x1);
-				FFB_WRITE64_2(&ffb->bh, y2, x2);
-			} else {
-				gcPriv->PolySegment(pDrawable, pGC, 1, pSeg);
-				ReloadSegmentAttrs(pFfb, gcPriv, pGC, pWin);
-				pFfb->rp_active = 1;
-			}
-			pSeg++;
-		}
-	}
-
-	FFBSync(pFfb, ffb);
-}