svn merge file:///D:/svnrepos/vcxsrv/branches/released .

1 files changed, 0 insertions, 316 deletions

diff --git a/xorg-server/cfb/cfbsetsp.c b/xorg-server/cfb/cfbsetsp.c
deleted file mode 100644
index a000fd9e1..000000000
--- a/xorg-server/cfb/cfbsetsp.c
+++ /dev/null
@@ -1,316 +0,0 @@
-/***********************************************************
-
-Copyright 1987, 1998  The Open Group
-
-Permission to use, copy, modify, distribute, and sell this software and its
-documentation for any purpose is hereby granted without fee, provided that
-the above copyright notice appear in all copies and that both that
-copyright notice and this permission notice appear in supporting
-documentation.
-
-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 THE
-OPEN GROUP 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.
-
-Except as contained in this notice, the name of The Open Group shall not be
-used in advertising or otherwise to promote the sale, use or other dealings
-in this Software without prior written authorization from The Open Group.
-
-
-Copyright 1987 by Digital Equipment Corporation, Maynard, Massachusetts.
-
-                        All Rights Reserved
-
-Permission to use, copy, modify, and distribute this software and its 
-documentation for any purpose and without fee is hereby granted, 
-provided that the above copyright notice appear in all copies and that
-both that copyright notice and this permission notice appear in 
-supporting documentation, and that the name of Digital not be
-used in advertising or publicity pertaining to distribution of the
-software without specific, written prior permission.  
-
-DIGITAL DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING
-ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL
-DIGITAL BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR
-ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS,
-WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
-ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
-SOFTWARE.
-
-******************************************************************/
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#include <X11/X.h>
-#include <X11/Xmd.h>
-#include "servermd.h"
-
-#include "misc.h"
-#include "regionstr.h"
-#include "gcstruct.h"
-#include "windowstr.h"
-#include "pixmapstr.h"
-#include "scrnintstr.h"
-
-#include "cfb.h"
-#include "cfbmskbits.h"
-#include <mergerop.h>
-
-/* cfbSetScanline -- copies the bits from psrc to the drawable starting at
- * (xStart, y) and continuing to (xEnd, y).  xOrigin tells us where psrc 
- * starts on the scanline. (I.e., if this scanline passes through multiple
- * boxes, we may not want to start grabbing bits at psrc but at some offset
- * further on.) 
- */
-void
-cfbSetScanline(y, xOrigin, xStart, xEnd, psrc, alu, pdstBase, widthDst, planemask)
-    int			y;
-    int			xOrigin;	/* where this scanline starts */
-    int			xStart;		/* first bit to use from scanline */
-    int			xEnd;		/* last bit to use from scanline + 1 */
-    register unsigned int *psrc;
-    register int	alu;		/* raster op */
-    int			*pdstBase;	/* start of the drawable */
-    int			widthDst;	/* width of drawable in words */
-    unsigned long	planemask;
-{
-    int			w;		/* width of scanline in bits */
-    register int	*pdst;		/* where to put the bits */
-    register int	tmpSrc;		/* scratch buffer to collect bits in */
-    int			offSrc;
-    int			nl;
-#if PSZ == 24
-    register char *psrcb, *pdstb;
-    register int	xIndex;
-#else
-    int			dstBit;		/* offset in bits from beginning of
-					 * word */
-    register int	nstart; 	/* number of bits from first partial */
-#if PSZ != 32 || PPW != 1
-    register int	nend; 		/* " " last partial word */
-#endif
-    int			startmask, endmask, nlMiddle;
-#endif
-    DeclareMergeRop()
-
-    InitializeMergeRop(alu,planemask);
-#if PSZ == 24
-    pdst = pdstBase + (y * widthDst);
-    xIndex = xStart;
-    pdstb = (char *)pdst + (xStart * 3);
-    offSrc = xStart - xOrigin;
-    psrcb = (char *)psrc + (offSrc * 3);
-#else
-    pdst = pdstBase + (y * widthDst) + (xStart >> PWSH); 
-    psrc += (xStart - xOrigin) >> PWSH;
-    offSrc = (xStart - xOrigin) & PIM;
-#endif
-    w = xEnd - xStart;
-
-#if PSZ == 24
-    nl = w;
-    while (nl--){
-      psrc = (unsigned int *)((unsigned long)psrcb & ~0x03);
-      getbits24(psrc, tmpSrc, offSrc);
-      pdst = (int *)((unsigned long)pdstb & ~0x03);
-      DoMergeRop24(tmpSrc, pdst, xIndex);
-      offSrc++;
-      psrcb += 3;
-      xIndex++;
-      pdstb += 3;
-    } 
-#else /* PSZ == 24 */
-    dstBit = xStart & PIM;
-    if (dstBit + w <= PPW) 
-    { 
-	maskpartialbits(dstBit, w, startmask);
-	endmask = 0;
-	nlMiddle = 0;
-    } 
-    else 
-    { 
-	maskbits(xStart, w, startmask, endmask, nlMiddle);
-    }
-    if (startmask) 
-	nstart = PPW - dstBit; 
-    else 
-	nstart = 0; 
-#if PSZ != 32 || PPW != 1
-    if (endmask) 
-	nend = xEnd & PIM; 
-    else 
-	nend = 0; 
-#endif
-    if (startmask) 
-    { 
-	getbits(psrc, offSrc, nstart, tmpSrc);
-	putbitsmropshort(tmpSrc, dstBit, nstart, pdst);
-	pdst++; 
-	offSrc += nstart;
-	if (offSrc > PLST)
-	{
-	    psrc++;
-	    offSrc -= PPW;
-	}
-    } 
-    nl = nlMiddle; 
-    while (nl--) 
-    { 
-	getbits(psrc, offSrc, PPW, tmpSrc);
-	*pdst = DoMergeRop(tmpSrc, *pdst);
-	pdst++; 
-	psrc++; 
-    } 
-    if (endmask) 
-    { 
-	getbits(psrc, offSrc, nend, tmpSrc);
-	putbitsmropshort(tmpSrc, 0, nend, pdst);
-    } 
-#endif /* PSZ == 24 */
-}
-
-
-
-/* SetSpans -- for each span copy pwidth[i] bits from psrc to pDrawable at
- * ppt[i] using the raster op from the GC.  If fSorted is TRUE, the scanlines
- * are in increasing Y order.
- * Source bit lines are server scanline padded so that they always begin
- * on a word boundary.
- */ 
-void
-cfbSetSpans(pDrawable, pGC, pcharsrc, ppt, pwidth, nspans, fSorted)
-    DrawablePtr		pDrawable;
-    GCPtr		pGC;
-    char		*pcharsrc;
-    register DDXPointPtr ppt;
-    int			*pwidth;
-    int			nspans;
-    int			fSorted;
-{
-    unsigned int	*psrc = (unsigned int *)pcharsrc;
-    CfbBits	*pdstBase;	/* start of dst bitmap */
-    int 		widthDst;	/* width of bitmap in words */
-    register BoxPtr 	pbox, pboxLast, pboxTest;
-    register DDXPointPtr pptLast;
-    int 		alu;
-    RegionPtr 		prgnDst;
-    int			xStart, xEnd;
-    int			yMax;
-
-    alu = pGC->alu;
-    prgnDst = cfbGetCompositeClip(pGC);
-    pptLast = ppt + nspans;
-
-    cfbGetLongWidthAndPointer (pDrawable, widthDst, pdstBase)
-
-    yMax = (int) pDrawable->y + (int) pDrawable->height;
-
-    pbox = REGION_RECTS(prgnDst);
-    pboxLast = pbox + REGION_NUM_RECTS(prgnDst);
-
-    if(fSorted)
-    {
-    /* scan lines sorted in ascending order. Because they are sorted, we
-     * don't have to check each scanline against each clip box.  We can be
-     * sure that this scanline only has to be clipped to boxes at or after the
-     * beginning of this y-band 
-     */
-	pboxTest = pbox;
-	while(ppt < pptLast)
-	{
-	    pbox = pboxTest;
-	    if(ppt->y >= yMax)
-		break;
-	    while(pbox < pboxLast)
-	    {
-		if(pbox->y1 > ppt->y)
-		{
-		    /* scanline is before clip box */
-		    break;
-		}
-		else if(pbox->y2 <= ppt->y)
-		{
-		    /* clip box is before scanline */
-		    pboxTest = ++pbox;
-		    continue;
-		}
-		else if(pbox->x1 > ppt->x + *pwidth) 
-		{
-		    /* clip box is to right of scanline */
-		    break;
-		}
-		else if(pbox->x2 <= ppt->x)
-		{
-		    /* scanline is to right of clip box */
-		    pbox++;
-		    continue;
-		}
-
-		/* at least some of the scanline is in the current clip box */
-		xStart = max(pbox->x1, ppt->x);
-		xEnd = min(ppt->x + *pwidth, pbox->x2);
-		cfbSetScanline(ppt->y, ppt->x, xStart, xEnd, psrc, alu,
-		    (int *)pdstBase, widthDst, pGC->planemask);
-		if(ppt->x + *pwidth <= pbox->x2)
-		{
-		    /* End of the line, as it were */
-		    break;
-		}
-		else
-		    pbox++;
-	    }
-	    /* We've tried this line against every box; it must be outside them
-	     * all.  move on to the next point */
-	    ppt++;
-	    psrc += PixmapWidthInPadUnits(*pwidth, pDrawable->depth);
-	    pwidth++;
-	}
-    }
-    else
-    {
-    /* scan lines not sorted. We must clip each line against all the boxes */
-	while(ppt < pptLast)
-	{
-	    if(ppt->y >= 0 && ppt->y < yMax)
-	    {
-		
-		for(pbox = REGION_RECTS(prgnDst); pbox< pboxLast; pbox++)
-		{
-		    if(pbox->y1 > ppt->y)
-		    {
-			/* rest of clip region is above this scanline,
-			 * skip it */
-			break;
-		    }
-		    if(pbox->y2 <= ppt->y)
-		    {
-			/* clip box is below scanline */
-			pbox++;
-			break;
-		    }
-		    if(pbox->x1 <= ppt->x + *pwidth &&
-		       pbox->x2 > ppt->x)
-		    {
-			xStart = max(pbox->x1, ppt->x);
-			xEnd = min(pbox->x2, ppt->x + *pwidth);
-			cfbSetScanline(ppt->y, ppt->x, xStart, xEnd, psrc, alu,
-			    (int *)pdstBase, widthDst, pGC->planemask);
-		    }
-
-		}
-	    }
-	psrc += PixmapWidthInPadUnits(*pwidth, pDrawable->depth);
-	ppt++;
-	pwidth++;
-	}
-    }
-}
-