xserver libX11 pixman git update 14/9/2010

49 files changed, 1269 insertions, 2728 deletions

diff --git a/xorg-server/dix/dixfonts.c b/xorg-server/dix/dixfonts.c
index dc4b32cc2..bd62cc890 100644
--- a/xorg-server/dix/dixfonts.c
+++ b/xorg-server/dix/dixfonts.c
@@ -1170,6 +1170,7 @@ doPolyText(ClientPtr client, PTclosurePtr c)
     enum { NEVER_SLEPT, START_SLEEP, SLEEPING } client_state = NEVER_SLEPT;

     FontPathElementPtr fpe;

     GC *origGC = NULL;

+    int itemSize = c->reqType == X_PolyText8 ? 1 : 2;

 

     if (client->clientGone)

     {

@@ -1255,10 +1256,6 @@ doPolyText(ClientPtr client, PTclosurePtr c)
 		    val.ptr = pFont;

 		    ChangeGC(NullClient, c->pGC, GCFont, &val);

 		    ValidateGC(c->pDraw, c->pGC);

-		    if (c->reqType == X_PolyText8)

-			c->polyText = (PolyTextPtr) c->pGC->ops->PolyText8;

-		    else

-			c->polyText = (PolyTextPtr) c->pGC->ops->PolyText16;

 		}

 

 		/* Undo the refcnt++ we performed when going to sleep */

@@ -1270,7 +1267,7 @@ doPolyText(ClientPtr client, PTclosurePtr c)
 	else	/* print a string */

 	{

 	    unsigned char *pNextElt;

-	    pNextElt = c->pElt + TextEltHeader + (*c->pElt)*c->itemSize;

+	    pNextElt = c->pElt + TextEltHeader + (*c->pElt) * itemSize;

 	    if ( pNextElt > c->endReq)

 	    {

 		err = BadLength;

@@ -1283,7 +1280,7 @@ doPolyText(ClientPtr client, PTclosurePtr c)
 	    }

 	    if (c->pDraw)

 	    {

-		lgerr = LoadGlyphs(client, c->pGC->font, *c->pElt, c->itemSize,

+		lgerr = LoadGlyphs(client, c->pGC->font, *c->pElt, itemSize,

 				   c->pElt + TextEltHeader);

 	    }

 	    else lgerr = Successful;

@@ -1381,8 +1378,12 @@ doPolyText(ClientPtr client, PTclosurePtr c)
 	    if (c->pDraw)

 	    {

 		c->xorg += *((INT8 *)(c->pElt + 1));	/* must be signed */

-		c->xorg = (* c->polyText)(c->pDraw, c->pGC, c->xorg, c->yorg,

-		    *c->pElt, c->pElt + TextEltHeader);

+		if (c->reqType == X_PolyText8)

+		    c->xorg = (* c->pGC->ops->PolyText8)(c->pDraw, c->pGC, c->xorg, c->yorg,

+			*c->pElt, (char *) (c->pElt + TextEltHeader));

+		else

+		    c->xorg = (* c->pGC->ops->PolyText16)(c->pDraw, c->pGC, c->xorg, c->yorg,

+			*c->pElt, (unsigned short *) (c->pElt + TextEltHeader));

 	    }

 	    c->pElt = pNextElt;

 	}

@@ -1442,16 +1443,7 @@ PolyText(ClientPtr client, DrawablePtr pDraw, GC *pGC, unsigned char *pElt,
     local_closure.pDraw = pDraw;

     local_closure.xorg = xorg;

     local_closure.yorg = yorg;

-    if ((local_closure.reqType = reqType) == X_PolyText8)

-    {

-	local_closure.polyText = (PolyTextPtr) pGC->ops->PolyText8;

-	local_closure.itemSize = 1;

-    }

-    else

-    {

-	local_closure.polyText =  (PolyTextPtr) pGC->ops->PolyText16;

-	local_closure.itemSize = 2;

-    }

+    local_closure.reqType = reqType;

     local_closure.pGC = pGC;

     local_closure.did = did;

     local_closure.err = Success;

@@ -1469,6 +1461,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
 {

     int err = Success, lgerr;	/* err is in X error, not font error, space */

     FontPathElementPtr fpe;

+    int itemSize = c->reqType == X_ImageText8 ? 1 : 2;

 

     if (client->clientGone)

     {

@@ -1493,7 +1486,7 @@ doImageText(ClientPtr client, ITclosurePtr c)
 	}

     }

 

-    lgerr = LoadGlyphs(client, c->pGC->font, c->nChars, c->itemSize, c->data);

+    lgerr = LoadGlyphs(client, c->pGC->font, c->nChars, itemSize, c->data);

     if (lgerr == Suspended)

     {

         if (!ClientIsAsleep(client)) {

@@ -1515,14 +1508,14 @@ doImageText(ClientPtr client, ITclosurePtr c)
 	    *new_closure = *c;

 	    c = new_closure;

 

-	    data = malloc(c->nChars * c->itemSize);

+	    data = malloc(c->nChars * itemSize);

 	    if (!data)

 	    {

 		free(c);

 		err = BadAlloc;

 		goto bail;

 	    }

-	    memmove(data, c->data, c->nChars * c->itemSize);

+	    memmove(data, c->data, c->nChars * itemSize);

 	    c->data = data;

 

 	    pGC = GetScratchGC(c->pGC->depth, c->pGC->pScreen);

@@ -1562,8 +1555,12 @@ doImageText(ClientPtr client, ITclosurePtr c)
     }

     if (c->pDraw)

     {

-	(* c->imageText)(c->pDraw, c->pGC, c->xorg, c->yorg,

-	    c->nChars, c->data);

+	if (c->reqType == X_ImageText8)

+	    (* c->pGC->ops->ImageText8)(c->pDraw, c->pGC, c->xorg, c->yorg,

+		c->nChars, (char *) c->data);

+	else

+	    (* c->pGC->ops->ImageText16)(c->pDraw, c->pGC, c->xorg, c->yorg,

+		c->nChars, (unsigned short *) c->data);

     }

 

 bail:

@@ -1601,16 +1598,7 @@ ImageText(ClientPtr client, DrawablePtr pDraw, GC *pGC, int nChars,
     local_closure.data = data;

     local_closure.xorg = xorg;

     local_closure.yorg = yorg;

-    if ((local_closure.reqType = reqType) == X_ImageText8)

-    {

-	local_closure.imageText = (ImageTextPtr) pGC->ops->ImageText8;

-	local_closure.itemSize = 1;

-    }

-    else

-    {

-	local_closure.imageText = (ImageTextPtr) pGC->ops->ImageText16;

-	local_closure.itemSize = 2;

-    }

+    local_closure.reqType = reqType;

     local_closure.did = did;

 

     (void) doImageText(client, &local_closure);

diff --git a/xorg-server/dix/gc.c b/xorg-server/dix/gc.c
index 902f20675..e7bcc66f1 100644
--- a/xorg-server/dix/gc.c
+++ b/xorg-server/dix/gc.c
@@ -527,8 +527,6 @@ CreateGC(DrawablePtr pDrawable, BITS32 mask, XID *pval, int *pStatus,
     pGC->numInDashList = 2;

     pGC->dash = DefaultDash;

     pGC->dashOffset = 0;

-    pGC->lastWinOrg.x = 0;

-    pGC->lastWinOrg.y = 0;

 

     /* use the default font and stipple */

     pGC->font = defaultFont;

@@ -801,7 +799,7 @@ is what fills the default tile.  (maybe this comment should
 go with CreateGC() or ChangeGC().)

 */

 

-GCPtr

+static GCPtr

 CreateScratchGC(ScreenPtr pScreen, unsigned depth)

 {

     GCPtr pGC;

@@ -841,8 +839,6 @@ CreateScratchGC(ScreenPtr pScreen, unsigned depth)
     pGC->dashOffset = 0;

     pGC->numInDashList = 2;

     pGC->dash = DefaultDash;

-    pGC->lastWinOrg.x = 0;

-    pGC->lastWinOrg.y = 0;

 

     /* scratch GCs in the GCperDepth pool start off unused */

     pGC->scratch_inuse = FALSE;

diff --git a/xorg-server/fb/fb.h b/xorg-server/fb/fb.h
index b7ac73f95..14c5ed137 100644
--- a/xorg-server/fb/fb.h
+++ b/xorg-server/fb/fb.h
@@ -666,7 +666,6 @@ typedef struct {
     FbBits		bgand, bgxor;	/* for stipples */

     FbBits		fg, bg, pm;	/* expanded and filled */

     unsigned int	dashLength;	/* total of all dash elements */

-    unsigned char    	oneRect;	/* clip list is single rectangle */

     unsigned char    	evenStipple;	/* stipple is even */

     unsigned char    	bpp;		/* current drawable bpp */

 } FbGCPrivRec, *FbGCPrivPtr;

diff --git a/xorg-server/fb/fbgc.c b/xorg-server/fb/fbgc.c
index 7b63b889e..75d240a33 100644
--- a/xorg-server/fb/fbgc.c
+++ b/xorg-server/fb/fbgc.c
@@ -64,19 +64,13 @@ const GCOps	fbGCOps = {
 Bool

 fbCreateGC(GCPtr pGC)

 {

-    pGC->clientClip = NULL;

-    pGC->clientClipType = CT_NONE;

-

     pGC->ops = (GCOps *) &fbGCOps;

     pGC->funcs = (GCFuncs *) &fbGCFuncs;

 

     /* fb wants to translate before scan conversion */

     pGC->miTranslate = 1;

+    pGC->fExpose = 1;

 

-    fbGetRotatedPixmap(pGC) = 0;

-    fbGetExpose(pGC) = 1;

-    fbGetFreeCompClip(pGC) = 0;

-    fbGetCompositeClip(pGC) = 0;

     fbGetGCPrivate(pGC)->bpp = BitsPerPixel (pGC->depth);

     return TRUE;

 }

@@ -199,9 +193,6 @@ fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
     FbGCPrivPtr	pPriv = fbGetGCPrivate(pGC);

     FbBits	mask;

 

-    pGC->lastWinOrg.x = pDrawable->x;

-    pGC->lastWinOrg.y = pDrawable->y;

-

     /*

      * if the client clip is different or moved OR the subwindowMode has

      * changed OR the window's clip has changed since the last validation

@@ -213,7 +204,6 @@ fbValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
 	)

     {

 	miComputeCompositeClip (pGC, pDrawable);

-	pPriv->oneRect = RegionNumRects(fbGetCompositeClip(pGC)) == 1;

     }

     

 #ifdef FB_24_32BIT    

diff --git a/xorg-server/glx/glxdriswrast.c b/xorg-server/glx/glxdriswrast.c
index fbda3cda5..32f5471a5 100644
--- a/xorg-server/glx/glxdriswrast.c
+++ b/xorg-server/glx/glxdriswrast.c
@@ -99,8 +99,8 @@ __glXDRIdrawableDestroy(__GLXdrawable *drawable)
 

     (*core->destroyDrawable)(private->driDrawable);

 

-    FreeScratchGC(private->gc);

-    FreeScratchGC(private->swapgc);

+    FreeGC(private->gc, (GContext)0);

+    FreeGC(private->swapgc, (GContext)0);

 

     __glXDrawableRelease(drawable);

 

@@ -301,13 +301,12 @@ __glXDRIscreenCreateDrawable(ClientPtr client,
 			     XID glxDrawId,

 			     __GLXconfig *glxConfig)

 {

-    ChangeGCVal gcvals[2];

+    XID gcvals[2];

+    int status;

     __GLXDRIscreen *driScreen = (__GLXDRIscreen *) screen;

     __GLXDRIconfig *config = (__GLXDRIconfig *) glxConfig;

     __GLXDRIdrawable *private;

 

-    ScreenPtr pScreen = driScreen->base.pScreen;

-

     private = calloc(1, sizeof *private);

     if (private == NULL)

 	return NULL;

@@ -323,13 +322,10 @@ __glXDRIscreenCreateDrawable(ClientPtr client,
     private->base.swapBuffers   = __glXDRIdrawableSwapBuffers;

     private->base.copySubBuffer = __glXDRIdrawableCopySubBuffer;

 

-    private->gc = CreateScratchGC(pScreen, pDraw->depth);

-    private->swapgc = CreateScratchGC(pScreen, pDraw->depth);

-

-    gcvals[0].val = GXcopy;

-    ChangeGC(NullClient, private->gc, GCFunction, gcvals);

-    gcvals[1].val = FALSE;

-    ChangeGC(NullClient, private->swapgc, GCFunction | GCGraphicsExposures, gcvals);

+    gcvals[0] = GXcopy;

+    private->gc = CreateGC(pDraw, GCFunction, gcvals, &status, (XID)0, serverClient);

+    gcvals[1] = FALSE;

+    private->swapgc = CreateGC(pDraw, GCFunction | GCGraphicsExposures, gcvals, &status, (XID)0, serverClient);

 

     private->driDrawable =

 	(*driScreen->swrast->createNewDrawable)(driScreen->driScreen,

diff --git a/xorg-server/hw/dmx/dmxinit.c b/xorg-server/hw/dmx/dmxinit.c
index 0871ab5f5..e0e5d1228 100644
--- a/xorg-server/hw/dmx/dmxinit.c
+++ b/xorg-server/hw/dmx/dmxinit.c
@@ -69,12 +69,6 @@
 #include "dmx_glxvisuals.h"

 #include <X11/extensions/Xext.h>

 #include <X11/extensions/extutil.h>

-

-extern void GlxSetVisualConfigs(

-    int               nconfigs,

-    __GLXvisualConfig *configs,

-    void              **configprivs

-);

 #endif /* GLXEXT */

 

 /* Global variables available to all Xserver/hw/dmx routines. */

@@ -768,9 +762,6 @@ void InitOutput(ScreenInfo *pScreenInfo, int argc, char *argv[])
 		    }

 		}

 

-		/* Hand out the glx configs to glx extension */

-		GlxSetVisualConfigs(nconfigs, configs, (void**)configprivs);

-

                 XFlush(dmxScreen->beDisplay);

 	    }

 	}

diff --git a/xorg-server/hw/dmx/glxProxy/glxcmds.c b/xorg-server/hw/dmx/glxProxy/glxcmds.c
index d0e3a9b77..f1893656f 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmds.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmds.c
@@ -38,11 +38,6 @@
 #include "dmxfont.h"

 #include "dmxsync.h"

 

-#undef Xmalloc

-#undef Xcalloc

-#undef Xrealloc

-#undef Xfree

-

 #include "glxserver.h"

 #include <GL/glxtokens.h>

 #include "g_disptab.h"

@@ -144,7 +139,7 @@ static int CreateContext(__GLXclientState *cl,
     /*

     ** Allocate memory for the new context

     */

-    glxc = __glXCalloc(1, sizeof(__GLXcontext));

+    glxc = calloc(1, sizeof(__GLXcontext));

     if (!glxc) {

 	return BadAlloc;

     }

@@ -156,7 +151,7 @@ static int CreateContext(__GLXclientState *cl,
        glxc->pFBConfig = glxLookupFBConfig( fbconfigId );

        if (!glxc->pFBConfig) {

 	  client->errorValue = fbconfigId;

-	  __glXFree( glxc );

+	  free( glxc );

 	  return BadValue;

        }

        visual = glxc->pFBConfig->associatedVisualId;

@@ -177,7 +172,7 @@ static int CreateContext(__GLXclientState *cl,
        }

        if (i == pScreen->numVisuals) {

 	  client->errorValue = visual;

-	  __glXFree( glxc );

+	  free( glxc );

 	  return BadValue;

        }

 

@@ -192,7 +187,7 @@ static int CreateContext(__GLXclientState *cl,
 	   ** Visual not support on this screen by this OpenGL implementation.

 	   */

 	  client->errorValue = visual;

-	  __glXFree( glxc );

+	  free( glxc );

 	  return BadValue;

        }

 

@@ -203,7 +198,7 @@ static int CreateContext(__GLXclientState *cl,
 	      /*

                * visual does not have an FBConfig ???

 	      client->errorValue = visual;

-	      __glXFree( glxc );

+	      free( glxc );

 	      return BadValue;

 	       */

 	   }

@@ -223,11 +218,11 @@ static int CreateContext(__GLXclientState *cl,
      * allocate memory for back-end servers info

      */

     num_be_screens = to_screen - from_screen + 1;

-    glxc->real_ids = (XID *)__glXMalloc(sizeof(XID) * num_be_screens);

+    glxc->real_ids = (XID *)malloc(sizeof(XID) * num_be_screens);

     if (!glxc->real_ids) {

 	return BadAlloc;

     }

-    glxc->real_vids = (XID *)__glXMalloc(sizeof(XID) * num_be_screens);

+    glxc->real_vids = (XID *)malloc(sizeof(XID) * num_be_screens);

     if (!glxc->real_vids) {

 	return BadAlloc;

     }

@@ -252,9 +247,9 @@ static int CreateContext(__GLXclientState *cl,
 

 	  if (!be_vid) {

 	     /* visual is not supported on the back-end server */

-	     __glXFree( glxc->real_ids );

-	     __glXFree( glxc->real_vids );

-	     __glXFree( glxc );

+	     free( glxc->real_ids );

+	     free( glxc->real_vids );

+	     free( glxc );

 	     return BadValue;

 	  }

        }

@@ -346,9 +341,9 @@ static int CreateContext(__GLXclientState *cl,
     ** Register this context as a resource.

     */

     if (!AddResource(gcId, __glXContextRes, (pointer)glxc)) {

-       __glXFree( glxc->real_ids );

-       __glXFree( glxc->real_vids );

-       __glXFree( glxc );

+       free( glxc->real_ids );

+       free( glxc->real_vids );

+       free( glxc );

 	client->errorValue = gcId;

 	return BadAlloc;

     }

@@ -585,16 +580,16 @@ static int AddCurrentContext(__GLXclientState *cl, __GLXcontext *glxc, DrawableP
     ** Didn't find a free slot, so we'll have to grow the table.

     */

     if (!num) {

-	table = (__GLXcontext **) __glXMalloc(sizeof(__GLXcontext *));

-	cl->currentDrawables = (DrawablePtr *) __glXMalloc(sizeof(DrawablePtr));

-	cl->be_currentCTag = (GLXContextTag *) __glXMalloc(screenInfo.numScreens *sizeof(GLXContextTag));

+	table = (__GLXcontext **) malloc(sizeof(__GLXcontext *));

+	cl->currentDrawables = (DrawablePtr *) malloc(sizeof(DrawablePtr));

+	cl->be_currentCTag = (GLXContextTag *) malloc(screenInfo.numScreens *sizeof(GLXContextTag));

     } else {

-	table = (__GLXcontext **) __glXRealloc(table,

+	table = (__GLXcontext **) realloc(table,

 					   (num+1)*sizeof(__GLXcontext *));

-	cl->currentDrawables = (DrawablePtr *) __glXRealloc(

+	cl->currentDrawables = (DrawablePtr *) realloc(

 	                                          cl->currentDrawables ,

 						  (num+1)*sizeof(DrawablePtr));

-	cl->be_currentCTag = (GLXContextTag *) __glXRealloc(cl->be_currentCTag,

+	cl->be_currentCTag = (GLXContextTag *) realloc(cl->be_currentCTag,

 	            (num+1)*screenInfo.numScreens*sizeof(GLXContextTag));

     }

     table[num] = glxc;

@@ -1721,13 +1716,13 @@ static int CreateGLXPixmap(__GLXclientState *cl,
        pGlxVisual = NULL;

     }

 

-    pGlxPixmap = (__GLXpixmap *) __glXMalloc(sizeof(__GLXpixmap));

+    pGlxPixmap = (__GLXpixmap *) malloc(sizeof(__GLXpixmap));

     if (!pGlxPixmap) {

 	return BadAlloc;

     }

-    pGlxPixmap->be_xids = (XID *) __glXMalloc(sizeof(XID) * screenInfo.numScreens);

+    pGlxPixmap->be_xids = (XID *) malloc(sizeof(XID) * screenInfo.numScreens);

     if (!pGlxPixmap->be_xids) {

-        __glXFree( pGlxPixmap );

+        free( pGlxPixmap );

 	return BadAlloc;

     }

 

@@ -1832,7 +1827,7 @@ static int CreateGLXPixmap(__GLXclientState *cl,
        }

        else {

 	  client->errorValue = ( visual ? visual : fbconfigId );

-          __glXFree( pGlxPixmap );

+          free( pGlxPixmap );

 	  return BadValue;

        }

 

@@ -1840,7 +1835,7 @@ static int CreateGLXPixmap(__GLXclientState *cl,
     }

 

     if (!(AddResource(glxpixmapId, __glXPixmapRes, pGlxPixmap))) {

-        __glXFree( pGlxPixmap );

+        free( pGlxPixmap );

 	return BadAlloc;

     }

 

@@ -2570,7 +2565,7 @@ int __glXClientInfo(__GLXclientState *cl, GLbyte *pc)
    

     cl->GLClientmajorVersion = req->major;

     cl->GLClientminorVersion = req->minor;

-    if (cl->GLClientextensions) __glXFree(cl->GLClientextensions);

+    if (cl->GLClientextensions) free(cl->GLClientextensions);

     buf = (const char *)(req+1);

     cl->GLClientextensions = strdup(buf);

 

diff --git a/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c b/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
index 8a2efaa73..da5956952 100644
--- a/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
+++ b/xorg-server/hw/dmx/glxProxy/glxcmdsswap.c
@@ -702,9 +702,9 @@ int __glXSwapRenderLarge(__GLXclientState *cl, GLbyte *pc)
 	*/

 	if (cl->largeCmdBufSize < hdr->length) {

 	    if (!cl->largeCmdBuf) {

-		cl->largeCmdBuf = (GLbyte *) __glXMalloc(hdr->length);

+		cl->largeCmdBuf = (GLbyte *) malloc(hdr->length);

 	    } else {

-		cl->largeCmdBuf = (GLbyte *) __glXRealloc(cl->largeCmdBuf, hdr->length);

+		cl->largeCmdBuf = (GLbyte *) realloc(cl->largeCmdBuf, hdr->length);

 	    }

 	    if (!cl->largeCmdBuf) {

 	       cl->largeCmdRequestsTotal = 0;

diff --git a/xorg-server/hw/dmx/glxProxy/glxext.c b/xorg-server/hw/dmx/glxProxy/glxext.c
index 6589e43bb..01cbd6e08 100644
--- a/xorg-server/hw/dmx/glxProxy/glxext.c
+++ b/xorg-server/hw/dmx/glxProxy/glxext.c
@@ -77,10 +77,10 @@ static void ResetClientState(int clientIndex)
     Display **keep_be_displays;

     int i;

 

-    if (cl->returnBuf) __glXFree(cl->returnBuf);

-    if (cl->currentContexts) __glXFree(cl->currentContexts);

-    if (cl->currentDrawables) __glXFree(cl->currentDrawables);

-    if (cl->largeCmdBuf) __glXFree(cl->largeCmdBuf);

+    if (cl->returnBuf) free(cl->returnBuf);

+    if (cl->currentContexts) free(cl->currentContexts);

+    if (cl->currentDrawables) free(cl->currentDrawables);

+    if (cl->largeCmdBuf) free(cl->largeCmdBuf);

 

     for (i=0; i< screenInfo.numScreens; i++) {

        if (cl->be_displays[i])

@@ -97,7 +97,7 @@ static void ResetClientState(int clientIndex)
     */

     cl->GLClientmajorVersion = 1;

     cl->GLClientminorVersion = 0;

-    if (cl->GLClientextensions) __glXFree(cl->GLClientextensions);

+    if (cl->GLClientextensions) free(cl->GLClientextensions);

 

     memset(cl->be_displays, 0, screenInfo.numScreens * sizeof(Display *));

 }

@@ -167,8 +167,8 @@ void __glXFreeGLXPixmap( __GLXpixmap *pGlxPixmap )
 	** only if it's zero.

 	*/

 	(*pGlxPixmap->pScreen->DestroyPixmap)(pPixmap);

-	__glXFree(pGlxPixmap->be_xids);

-	__glXFree(pGlxPixmap);

+	free(pGlxPixmap->be_xids);

+	free(pGlxPixmap);

     }

 

 }

@@ -222,10 +222,10 @@ GLboolean __glXFreeContext(__GLXcontext *cx)
 {

     if (cx->idExists || cx->isCurrent) return GL_FALSE;

     

-    if (cx->feedbackBuf) __glXFree(cx->feedbackBuf);

-    if (cx->selectBuf) __glXFree(cx->selectBuf);

-    if (cx->real_ids) __glXFree(cx->real_ids);

-    if (cx->real_vids) __glXFree(cx->real_vids);

+    if (cx->feedbackBuf) free(cx->feedbackBuf);

+    if (cx->selectBuf) free(cx->selectBuf);

+    if (cx->real_ids) free(cx->real_ids);

+    if (cx->real_vids) free(cx->real_vids);

 

     if (cx->pGlxPixmap) {

        /*

@@ -263,7 +263,7 @@ GLboolean __glXFreeContext(__GLXcontext *cx)
        cx->pGlxReadWindow = 0;   

     }

 

-    __glXFree(cx);

+    free(cx);

 

     if (cx == __glXLastContext) {

 	__glXFlushContextCache();

@@ -367,46 +367,6 @@ Bool __glXCoreType(void)
 

 /************************************************************************/

 

-void GlxSetVisualConfigs(int nconfigs, 

-                         __GLXvisualConfig *configs, void **privates)

-{

-    glxSetVisualConfigs(nconfigs, configs, privates);

-}

-

-static miInitVisualsProcPtr saveInitVisualsProc;

-

-Bool GlxInitVisuals(VisualPtr *visualp, DepthPtr *depthp,

-		    int *nvisualp, int *ndepthp,

-		    int *rootDepthp, VisualID *defaultVisp,

-		    unsigned long sizes, int bitsPerRGB,

-		    int preferredVis)

-{

-    Bool ret;

-

-    if (saveInitVisualsProc) {

-        ret = saveInitVisualsProc(visualp, depthp, nvisualp, ndepthp,

-                                  rootDepthp, defaultVisp, sizes, bitsPerRGB,

-                                  preferredVis);

-        if (!ret)

-            return False;

-    }

-

-    glxInitVisuals(nvisualp, visualp, defaultVisp, *ndepthp, *depthp,*rootDepthp);

-

-    return True;

-}

-

-void

-GlxWrapInitVisuals(miInitVisualsProcPtr *initVisProc)

-{

-    if (dmxGLXProxy) {

-	saveInitVisualsProc = *initVisProc;

-	*initVisProc = GlxInitVisuals;

-    }

-}

-

-/************************************************************************/

-

 void __glXFlushContextCache(void)

 {

     __glXLastContext = 0;

@@ -427,15 +387,15 @@ static int __glXDispatch(ClientPtr client)
     opcode = stuff->glxCode;

     cl = __glXClients[client->index];

     if (!cl) {

-	cl = __glXCalloc(1, sizeof(__GLXclientState));

+	cl = calloc(1, sizeof(__GLXclientState));

 	 __glXClients[client->index] = cl;

 	if (!cl) {

 	    return BadAlloc;

 	}

 

-	cl->be_displays = __glXCalloc(screenInfo.numScreens, sizeof(Display *));

+	cl->be_displays = calloc(screenInfo.numScreens, sizeof(Display *));

 	if (!cl->be_displays) {

-	    __glXFree( cl );

+	    free( cl );

 	    return BadAlloc;

 	}

     }

@@ -479,15 +439,15 @@ static int __glXSwapDispatch(ClientPtr client)
     opcode = stuff->glxCode;

     cl = __glXClients[client->index];

     if (!cl) {

-	cl = __glXCalloc(1, sizeof(__GLXclientState));

+	cl = calloc(1, sizeof(__GLXclientState));

 	 __glXClients[client->index] = cl;

 	if (!cl) {

 	    return BadAlloc;

 	}

 

-	cl->be_displays = __glXCalloc(screenInfo.numScreens, sizeof(Display *));

+	cl->be_displays = calloc(screenInfo.numScreens, sizeof(Display *));

 	if (!cl->be_displays) {

-	    __glXFree( cl );

+	    free( cl );

 	    return BadAlloc;

 	}

     }

diff --git a/xorg-server/hw/dmx/glxProxy/glxext.h b/xorg-server/hw/dmx/glxProxy/glxext.h
index b9f75b46b..3e3e5b7f3 100644
--- a/xorg-server/hw/dmx/glxProxy/glxext.h
+++ b/xorg-server/hw/dmx/glxProxy/glxext.h
@@ -1,92 +1,78 @@
-#ifndef _glxext_h_
-#define _glxext_h_
-
-/*
- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
- * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
- *
- * 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 including the dates of first publication and
- * either this permission notice or a reference to
- * http://oss.sgi.com/projects/FreeB/
- * 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
- * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
- * shall not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization from
- * Silicon Graphics, Inc.
- */
-
-/*
- * Added by VA Linux for XFree86 4.0.x
- */
-typedef struct {
-    int type;
-    void (*resetExtension)(void);
-    Bool (*initVisuals)(
-        VisualPtr *       visualp,
-        DepthPtr *        depthp,
-        int *             nvisualp,
-        int *             ndepthp,
-        int *             rootDepthp,
-        VisualID *        defaultVisp,
-        unsigned long     sizes,
-        int               bitsPerRGB
-        );
-    void (*setVisualConfigs)(
-        int                nconfigs,
-        __GLXvisualConfig *configs,
-        void              **privates
-        );
-} __GLXextensionInfo;
-
-extern GLboolean __glXFreeContext(__GLXcontext *glxc);
-extern void __glXFlushContextCache(void);
-
-extern void __glXFreeGLXWindow(__glXWindow *pGlxWindow);
-extern void __glXFreeGLXPixmap( __GLXpixmap *pGlxPixmap );
-
-extern void __glXNoSuchRenderOpcode(GLbyte*);
-extern int __glXNoSuchSingleOpcode(__GLXclientState*, GLbyte*);
-extern void __glXErrorCallBack(GLenum code);
-extern void __glXClearErrorOccured(void);
-extern GLboolean __glXErrorOccured(void);
-extern void __glXResetLargeCommandStatus(__GLXclientState*);
-
-extern int __glXQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc);
-extern int __glXSwapQueryContextInfoEXT(__GLXclientState *cl, char *pc);
-
-extern void GlxExtensionInit(void);
-
-extern Bool __glXCoreType(void);
-
-extern int GlxInitVisuals(
-#if NeedFunctionPrototypes
-    VisualPtr *       visualp,
-    DepthPtr *        depthp,
-    int *             nvisualp,
-    int *             ndepthp,
-    int *             rootDepthp,
-    VisualID *        defaultVisp,
-    unsigned long     sizes,
-    int               bitsPerRGB,
-    int               preferredVis
-#endif
-);
-
-#endif /* _glxext_h_ */
-
+#ifndef _glxext_h_

+#define _glxext_h_

+

+/*

+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

+ * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.

+ *

+ * 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 including the dates of first publication and

+ * either this permission notice or a reference to

+ * http://oss.sgi.com/projects/FreeB/

+ * 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

+ * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.

+ * shall not be used in advertising or otherwise to promote the sale, use or

+ * other dealings in this Software without prior written authorization from

+ * Silicon Graphics, Inc.

+ */

+

+/*

+ * Added by VA Linux for XFree86 4.0.x

+ */

+typedef struct {

+    int type;

+    void (*resetExtension)(void);

+    Bool (*initVisuals)(

+        VisualPtr *       visualp,

+        DepthPtr *        depthp,

+        int *             nvisualp,

+        int *             ndepthp,

+        int *             rootDepthp,

+        VisualID *        defaultVisp,

+        unsigned long     sizes,

+        int               bitsPerRGB

+        );

+    void (*setVisualConfigs)(

+        int                nconfigs,

+        __GLXvisualConfig *configs,

+        void              **privates

+        );

+} __GLXextensionInfo;

+

+extern GLboolean __glXFreeContext(__GLXcontext *glxc);

+extern void __glXFlushContextCache(void);

+

+extern void __glXFreeGLXWindow(__glXWindow *pGlxWindow);

+extern void __glXFreeGLXPixmap( __GLXpixmap *pGlxPixmap );

+

+extern void __glXNoSuchRenderOpcode(GLbyte*);

+extern int __glXNoSuchSingleOpcode(__GLXclientState*, GLbyte*);

+extern void __glXErrorCallBack(GLenum code);

+extern void __glXClearErrorOccured(void);

+extern GLboolean __glXErrorOccured(void);

+extern void __glXResetLargeCommandStatus(__GLXclientState*);

+

+extern int __glXQueryContextInfoEXT(__GLXclientState *cl, GLbyte *pc);

+extern int __glXSwapQueryContextInfoEXT(__GLXclientState *cl, char *pc);

+

+extern void GlxExtensionInit(void);

+

+extern Bool __glXCoreType(void);

+

+#endif /* _glxext_h_ */

+

diff --git a/xorg-server/hw/dmx/glxProxy/glxscreens.c b/xorg-server/hw/dmx/glxProxy/glxscreens.c
index 6425a2bfe..df49fe50d 100644
--- a/xorg-server/hw/dmx/glxProxy/glxscreens.c
+++ b/xorg-server/hw/dmx/glxProxy/glxscreens.c
@@ -35,11 +35,6 @@
 #include "dmx.h"

 #include "dmxlog.h"

 

-#undef Xmalloc

-#undef Xcalloc

-#undef Xrealloc

-#undef Xfree

-

 #include "glxserver.h"

 

 #include <windowstr.h>

diff --git a/xorg-server/hw/dmx/glxProxy/glxsingle.c b/xorg-server/hw/dmx/glxProxy/glxsingle.c
index 056c74066..7856f5884 100644
--- a/xorg-server/hw/dmx/glxProxy/glxsingle.c
+++ b/xorg-server/hw/dmx/glxProxy/glxsingle.c
@@ -39,11 +39,6 @@
 #include "dmxfont.h"

 #include "dmxcb.h"

 

-#undef Xmalloc

-#undef Xcalloc

-#undef Xrealloc

-#undef Xfree

-

 #include "glxserver.h"

 #include "glxext.h"

 #include "g_disptab.h"

diff --git a/xorg-server/hw/dmx/glxProxy/glxutil.c b/xorg-server/hw/dmx/glxProxy/glxutil.c
index ad34eef05..1b9ad6962 100644
--- a/xorg-server/hw/dmx/glxProxy/glxutil.c
+++ b/xorg-server/hw/dmx/glxProxy/glxutil.c
@@ -29,81 +29,6 @@
  */

 

 #include "glxserver.h"

-#include <GL/glxtokens.h>

-#include <pixmapstr.h>

-#include <windowstr.h>

 #include "glxutil.h"

-#include <stdlib.h>

-

-/************************************************************************/

 

 void __glXNop(void) {}

-

-/************************************************************************/

-

-/* Memory Allocation for GLX */

-

-void *

-__glXMalloc(size_t size)

-{

-    void *addr;

-

-    if (size == 0) {

-	return NULL;

-    }

-    addr = malloc(size);

-    if (addr == NULL) {

-	/* XXX: handle out of memory error */

-	return NULL;

-    }

-    return addr;

-}

-

-void *

-__glXCalloc(size_t numElements, size_t elementSize)

-{

-    void *addr;

-    size_t size;

-

-    if ((numElements == 0) || (elementSize == 0)) {

-	return NULL;

-    }

-    addr = calloc(numElements, elementSize);

-    if (addr == NULL) {

-	/* XXX: handle out of memory error */

-	return NULL;

-    }

-    return addr;

-}

-

-void *

-__glXRealloc(void *addr, size_t newSize)

-{

-    void *newAddr;

-

-    if (addr) {

-	if (newSize == 0) {

-	    free(addr);

-	    return NULL;

-	} else {

-	    newAddr = realloc(addr, newSize);

-	}

-    } else {

-	if (newSize == 0) {

-	    return NULL;

-	} else {

-	    newAddr = malloc(newSize);

-	}

-    }

-    if (newAddr == NULL) {

-	return NULL;	/* XXX: out of memory */

-    }

-

-    return newAddr;

-}

-

-void

-__glXFree(void *addr)

-{

-    free(addr);

-}

diff --git a/xorg-server/hw/dmx/glxProxy/glxutil.h b/xorg-server/hw/dmx/glxProxy/glxutil.h
index 6487ca716..15237b258 100644
--- a/xorg-server/hw/dmx/glxProxy/glxutil.h
+++ b/xorg-server/hw/dmx/glxProxy/glxutil.h
@@ -1,48 +1,42 @@
-#ifndef _glxcmds_h_
-#define _glxcmds_h_
-
-/*
- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
- * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
- *
- * 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 including the dates of first publication and
- * either this permission notice or a reference to
- * http://oss.sgi.com/projects/FreeB/
- * 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
- * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
- * shall not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization from
- * Silicon Graphics, Inc.
- */
-
-extern void __glXNop(void);
-
-/* memory management */
-extern void *__glXMalloc(size_t size);
-extern void *__glXCalloc(size_t numElements, size_t elementSize);
-extern void *__glXRealloc(void *addr, size_t newSize);
-extern void __glXFree(void *ptr);
-
-/* context helper routines */
-extern __GLXcontext *__glXLookupContextByTag(__GLXclientState*, GLXContextTag);
-extern DrawablePtr __glXLookupDrawableByTag(__GLXclientState *cl, GLXContextTag tag);
-
-
-#endif /* _glxcmds_h_ */
-
+#ifndef _glxcmds_h_

+#define _glxcmds_h_

+

+/*

+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

+ * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.

+ *

+ * 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 including the dates of first publication and

+ * either this permission notice or a reference to

+ * http://oss.sgi.com/projects/FreeB/

+ * 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

+ * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.

+ * shall not be used in advertising or otherwise to promote the sale, use or

+ * other dealings in this Software without prior written authorization from

+ * Silicon Graphics, Inc.

+ */

+

+extern void __glXNop(void);

+

+/* context helper routines */

+extern __GLXcontext *__glXLookupContextByTag(__GLXclientState*, GLXContextTag);

+extern DrawablePtr __glXLookupDrawableByTag(__GLXclientState *cl, GLXContextTag tag);

+

+

+#endif /* _glxcmds_h_ */

+

diff --git a/xorg-server/hw/dmx/glxProxy/glxvendor.c b/xorg-server/hw/dmx/glxProxy/glxvendor.c
index 02c8ad73d..26a9c92fb 100644
--- a/xorg-server/hw/dmx/glxProxy/glxvendor.c
+++ b/xorg-server/hw/dmx/glxProxy/glxvendor.c
@@ -38,11 +38,6 @@
 #include "dmxpixmap.h"

 #include "dmxfont.h"

 

-#undef Xmalloc

-#undef Xcalloc

-#undef Xrealloc

-#undef Xfree

-

 #include "glxserver.h"

 #include "glxext.h"

 #include "g_disptab.h"

diff --git a/xorg-server/hw/dmx/glxProxy/glxvisuals.c b/xorg-server/hw/dmx/glxProxy/glxvisuals.c
index aaace39b6..ae5e86772 100644
--- a/xorg-server/hw/dmx/glxProxy/glxvisuals.c
+++ b/xorg-server/hw/dmx/glxProxy/glxvisuals.c
@@ -32,16 +32,8 @@
 #include <dmx-config.h>

 #endif

 

-#include <assert.h>

-#include "dmx.h"

 #include "glxserver.h"

-#include "glxutil.h"

-#include "dmx_glxvisuals.h"

-#include <stdlib.h>

-

-static int                 numConfigs     = 0;

-static __GLXvisualConfig  *visualConfigs  = NULL;

-static void              **visualPrivates = NULL;

+#include "glxvisuals.h"

 

 int glxVisualsMatch( __GLXvisualConfig *v1, __GLXvisualConfig *v2 )

 {

@@ -158,381 +150,3 @@ VisualPtr glxMatchVisual( ScreenPtr pScreen, VisualPtr pVisual, ScreenPtr pMatch
 

     return 0;

 }

-

-void glxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs,

-                 void **privates)

-{

-    numConfigs = nconfigs;

-    visualConfigs = configs;

-    visualPrivates = privates;

-}

-

-static int count_bits(unsigned int n)

-{

-   int bits = 0;

-

-   while (n > 0) {

-      if (n & 1) bits++;

-      n >>= 1;

-   }

-   return bits;

-}

-

-static VisualID FindClosestVisual( VisualPtr pVisual, int rootDepth, 

-                                   DepthPtr pdepth, int ndepths,

-				   VisualPtr pNewVisual, int numNewVisuals)

-{

-   int d, v;

-   VisualPtr vis;

-

-   /*

-    * find the first visual with the same or deeper depth

-    * of the same class.

-    */

-   for (d=0; d<ndepths; d++) {

-      if (pdepth[d].depth >= rootDepth) {

-	 for (v=0; v<pdepth[d].numVids; v++) {

-

-	    /* find the new visual structure */

-	    vis = pNewVisual;

-	    while( pdepth[d].vids[v] != vis->vid ) vis++;

-

-	    if (vis->class == pVisual->class) {

-	       return pdepth[d].vids[v];

-	    }

-	 }

-      }

-   }

-

-   /*

-    * did not find any.

-    * try to look for the same class only.

-    */

-   for (d=0; d<ndepths; d++) {

-      for (v=0; v<pdepth[d].numVids; v++) {

-

-	 /* find the new visual structure */

-      	 vis = pNewVisual;

-	 while( pdepth[d].vids[v] != vis->vid ) vis++;

-

-      	 if (vis->class == pVisual->class) {

-	    return pdepth[d].vids[v];

-	 }

-      }

-   }

-

-   /*

-    * if not found - just take the first visual

-    */

-   return pdepth[0].vids[0];

-}

-

-Bool glxInitVisuals(int *nvisualp, VisualPtr *visualp,

-			 VisualID *defaultVisp,

-			 int ndepth, DepthPtr pdepth,

-			 int rootDepth)

-{

-    int numRGBconfigs;

-    int numCIconfigs;

-    int numVisuals = *nvisualp;

-    int numNewVisuals;

-    int numNewConfigs;

-    VisualPtr pVisual = *visualp;

-    VisualPtr pVisualNew = NULL;

-    VisualID *orig_vid = NULL;

-    __GLXvisualConfig *glXVisualPtr = NULL;

-    __GLXvisualConfig *pNewVisualConfigs = NULL;

-    void **glXVisualPriv;

-    dmxGlxVisualPrivate **pNewVisualPriv;

-    int found_default;

-    int i, j, k;

-    int numGLXvis = 0;

-    GLint *isGLXvis;

-

-    if (numConfigs > 0)

-        numNewConfigs = numConfigs;

-    else

-        return False;

-

-    MAXSCREENSALLOC(__glXActiveScreens);

-    if (!__glXActiveScreens)

-        return False;

-

-    /* Alloc space for the list of new GLX visuals */

-    pNewVisualConfigs = (__GLXvisualConfig *)

-                     __glXMalloc(numNewConfigs * sizeof(__GLXvisualConfig));

-    if (!pNewVisualConfigs) {

-	return FALSE;

-    }

-

-    /* Alloc space for the list of new GLX visual privates */

-    pNewVisualPriv = (dmxGlxVisualPrivate **) __glXMalloc(numNewConfigs * sizeof(dmxGlxVisualPrivate *));

-    if (!pNewVisualPriv) {

-	__glXFree(pNewVisualConfigs);

-	return FALSE;

-    }

-

-    /* copy driver's visual config info */

-    for (i = 0; i < numConfigs; i++) {

-       pNewVisualConfigs[i] = visualConfigs[i];

-       pNewVisualPriv[i] = (dmxGlxVisualPrivate *)visualPrivates[i];

-    }

-

-#if 1

-    /* FIXME: This is a hack to workaround a hang in xtest caused by a

-     * mismatch between what the front end (i.e., DMX) server calculates

-     * for the visual configs and what the back-end servers have.

-     */

-    {

-	int numTCRGBconfigs = 0;

-	int numDCRGBconfigs = 0;

-

-	numRGBconfigs = 0;

-	numCIconfigs = 0;

-

-	for (i = 0; i < numNewConfigs; i++) {

-	    if (pNewVisualConfigs[i].rgba) {

-		if (pNewVisualConfigs[i].class == TrueColor)

-		    numTCRGBconfigs++;

-		else

-		    numDCRGBconfigs++;

-		numRGBconfigs++;

-	    } else

-		numCIconfigs++;

-	}

-

-	/* Count the total number of visuals to compute */

-	numNewVisuals = 0;

-	for (i = 0; i < numVisuals; i++) {

-	    numNewVisuals +=

-		(pVisual[i].class == TrueColor)   ? numTCRGBconfigs :

-		(pVisual[i].class == DirectColor) ? numDCRGBconfigs :

-						    numCIconfigs;

-	}

-    }

-#else

-    /* Count the number of RGB and CI visual configs */

-    numRGBconfigs = 0;

-    numCIconfigs = 0;

-    for (i = 0; i < numNewConfigs; i++) {

-	if (pNewVisualConfigs[i].rgba)

-	    numRGBconfigs++;

-	else

-	    numCIconfigs++;

-    }

-

-    /* Count the total number of visuals to compute */

-    numNewVisuals = 0;

-    for (i = 0; i < numVisuals; i++) {

-        numNewVisuals +=

-	    (pVisual[i].class == TrueColor || pVisual[i].class == DirectColor)

-	    ? numRGBconfigs : numCIconfigs;

-    }

-#endif

-

-    /* Reset variables for use with the next screen/driver's visual configs */

-    visualConfigs = NULL;

-    numConfigs = 0;

-

-    /* Alloc temp space for the list of orig VisualIDs for each new visual */

-    orig_vid = (VisualID *)__glXMalloc(numNewVisuals * sizeof(VisualID));

-    if (!orig_vid) {

-	__glXFree(pNewVisualPriv);

-	__glXFree(pNewVisualConfigs);

-	return FALSE;

-    }

-

-    /* Alloc space for the list of glXVisuals */

-    glXVisualPtr = (__GLXvisualConfig *)__glXMalloc(numNewVisuals *

-						    sizeof(__GLXvisualConfig));

-    if (!glXVisualPtr) {

-	__glXFree(orig_vid);

-	__glXFree(pNewVisualPriv);

-	__glXFree(pNewVisualConfigs);

-	return FALSE;

-    }

-

-    /* Alloc space for the list of glXVisualPrivates */

-    glXVisualPriv = (void **)__glXMalloc(numNewVisuals * sizeof(void *));

-    if (!glXVisualPriv) {

-	__glXFree(glXVisualPtr);

-	__glXFree(orig_vid);

-	__glXFree(pNewVisualPriv);

-	__glXFree(pNewVisualConfigs);

-	return FALSE;

-    }

-

-    /* Alloc space for the new list of the X server's visuals */

-    pVisualNew = (VisualPtr)__glXMalloc(numNewVisuals * sizeof(VisualRec));

-    if (!pVisualNew) {

-	__glXFree(glXVisualPriv);

-	__glXFree(glXVisualPtr);

-	__glXFree(orig_vid);

-	__glXFree(pNewVisualPriv);

-	__glXFree(pNewVisualConfigs);

-	return FALSE;

-    }

-

-    isGLXvis = (GLint *) __glXMalloc(numNewVisuals * sizeof(GLint));

-    if (!isGLXvis) {

-	__glXFree(glXVisualPriv);

-	__glXFree(glXVisualPtr);

-	__glXFree(orig_vid);

-	__glXFree(pNewVisualPriv);

-	__glXFree(pNewVisualConfigs);

-	__glXFree(pVisualNew);

-	return FALSE;

-    }

-

-    /* Initialize the new visuals */

-    found_default = FALSE;

-    for (i = j = 0; i < numVisuals; i++) {

-

-	for (k = 0; k < numNewConfigs; k++) {

-

-	    int new_depth;

-	    int depth;

-	    int d,v;

-

-	    /* find the depth of the new visual config */

-	    new_depth = pNewVisualPriv[k]->x_visual_depth;

-

-	    /* find the depth of the original visual */

-	    depth = 0;

-	    d = 0;

-	    while( (depth==0) && (d < ndepth) ) {

-	       v = 0;

-	       while( (depth==0) && (v < pdepth[d].numVids) ) {

-		  if (pdepth[d].vids[v] ==  pVisual[i].vid) {

-		     depth = pdepth[d].depth;

-		  }

-		  v++;

-	       }

-	       d++;

-	    }

-

-	    /* check that the visual has the same class and depth 

-	     * as the new config

-             */

-	    if ( pVisual[i].class != pNewVisualPriv[k]->x_visual_class ||

-		  (depth != new_depth) )

-		continue;

-

-	    /* Initialize the new visual */

-	    pVisualNew[j] = pVisual[i];

-	    pVisualNew[j].vid = FakeClientID(0);

-

-	    /* Check for the default visual */

-	    if (!found_default && pVisual[i].vid == *defaultVisp) {

-		*defaultVisp = pVisualNew[j].vid;

-		found_default = TRUE;

-	    }

-

-	    /* Save the old VisualID */

-	    orig_vid[j] = pVisual[i].vid;

-

-	    /* Initialize the glXVisual */

-	    glXVisualPtr[j] = pNewVisualConfigs[k];

-	    glXVisualPtr[j].vid = pVisualNew[j].vid;

-

-	    /*

-	     * If the class is -1, then assume the X visual information

-	     * is identical to what GLX needs, and take them from the X

-	     * visual.  NOTE: if class != -1, then all other fields MUST

-	     * be initialized.

-	     */

-	    if (glXVisualPtr[j].class == -1) {

-		glXVisualPtr[j].class      = pVisual[i].class;

-		glXVisualPtr[j].redSize    = count_bits(pVisual[i].redMask);

-		glXVisualPtr[j].greenSize  = count_bits(pVisual[i].greenMask);

-		glXVisualPtr[j].blueSize   = count_bits(pVisual[i].blueMask);

-		glXVisualPtr[j].alphaSize  = glXVisualPtr[j].alphaSize;

-		glXVisualPtr[j].redMask    = pVisual[i].redMask;

-		glXVisualPtr[j].greenMask  = pVisual[i].greenMask;

-		glXVisualPtr[j].blueMask   = pVisual[i].blueMask;

-		glXVisualPtr[j].alphaMask  = glXVisualPtr[j].alphaMask;

-		glXVisualPtr[j].bufferSize = rootDepth;

-	    }

-

-	    /* Save the device-dependent private for this visual */

-	    glXVisualPriv[j] = pNewVisualPriv[k];

-

-            isGLXvis[j] = glxMatchGLXVisualInConfigList( &glXVisualPtr[j], 

-	                           dmxScreens[screenInfo.numScreens-1].glxVisuals,

-	                           dmxScreens[screenInfo.numScreens-1].numGlxVisuals );

-	    if (isGLXvis[j]) numGLXvis++;

-

-	    j++;

-	}

-    }

-

-    assert(j <= numNewVisuals);

-    numNewVisuals = j;   /* correct number of new visuals */

-

-    /* Save the GLX visuals in the screen structure */

-    __glXActiveScreens[screenInfo.numScreens-1].numVisuals = numNewVisuals;

-    __glXActiveScreens[screenInfo.numScreens-1].numGLXVisuals = numGLXvis;

-    __glXActiveScreens[screenInfo.numScreens-1].isGLXvis = isGLXvis;

-    __glXActiveScreens[screenInfo.numScreens-1].pGlxVisual = glXVisualPtr;

-

-

-    /* Set up depth's VisualIDs */

-    for (i = 0; i < ndepth; i++) {

-	int numVids = 0;

-	VisualID *pVids = NULL;

-	int k, n = 0;

-

-	/* Count the new number of VisualIDs at this depth */

-	for (j = 0; j < pdepth[i].numVids; j++)

-	    for (k = 0; k < numNewVisuals; k++)

-		if (pdepth[i].vids[j] == orig_vid[k])

-		    numVids++;

-

-	/* Allocate a new list of VisualIDs for this depth */

-	pVids = (VisualID *)__glXMalloc(numVids * sizeof(VisualID));

-

-	/* Initialize the new list of VisualIDs for this depth */

-	for (j = 0; j < pdepth[i].numVids; j++)

-	    for (k = 0; k < numNewVisuals; k++)

-		if (pdepth[i].vids[j] == orig_vid[k])

-		    pVids[n++] = pVisualNew[k].vid;

-

-	/* Update this depth's list of VisualIDs */

-	__glXFree(pdepth[i].vids);

-	pdepth[i].vids = pVids;

-	pdepth[i].numVids = numVids;

-    }

-

-    /*

-     * if the default visual was rejected - need to choose new

-     * default visual !

-     */ 

-    if ( !found_default ) {

-

-       for (i=0; i<numVisuals; i++)

-	  if (pVisual[i].vid == *defaultVisp)

-	     break;

-

-       if (i < numVisuals) {

-	  *defaultVisp = FindClosestVisual( &pVisual[i], rootDepth, pdepth, ndepth, pVisualNew, numNewVisuals );

-       }

-    }

-

-    /* Update the X server's visuals */

-    *nvisualp = numNewVisuals;

-    *visualp = pVisualNew;

-

-    /* Free the old list of the X server's visuals */

-    __glXFree(pVisual);

-

-    /* Clean up temporary allocations */

-    __glXFree(orig_vid);

-    __glXFree(pNewVisualPriv);

-    __glXFree(pNewVisualConfigs);

-

-    /* Free the private list created by DDX HW driver */

-    free(visualPrivates);

-    visualPrivates = NULL;

-

-    return TRUE;

-}

diff --git a/xorg-server/hw/dmx/glxProxy/glxvisuals.h b/xorg-server/hw/dmx/glxProxy/glxvisuals.h
index b00e40790..4245313ba 100644
--- a/xorg-server/hw/dmx/glxProxy/glxvisuals.h
+++ b/xorg-server/hw/dmx/glxProxy/glxvisuals.h
@@ -1,50 +1,42 @@
-/*
- * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)
- * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.
- *
- * 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 including the dates of first publication and
- * either this permission notice or a reference to
- * http://oss.sgi.com/projects/FreeB/
- * 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
- * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.
- * shall not be used in advertising or otherwise to promote the sale, use or
- * other dealings in this Software without prior written authorization from
- * Silicon Graphics, Inc.
- */
-
-#ifndef _GLX_VISUALS_H
-#define _GLX_VISUALS_H
-
-int glxVisualsMatch( __GLXvisualConfig *v1, __GLXvisualConfig *v2 );
-
-VisualID glxMatchGLXVisualInConfigList( __GLXvisualConfig *pGlxVisual, __GLXvisualConfig *configs, int nconfigs );
-
-VisualID glxMatchVisualInConfigList( ScreenPtr pScreen, VisualPtr pVisual, __GLXvisualConfig *configs, int nconfigs );
-
-VisualPtr glxMatchVisual( ScreenPtr pScreen, VisualPtr pVisual, ScreenPtr pMatchScreen );
-
-void glxSetVisualConfigs(int nconfigs, __GLXvisualConfig *configs,
-                 void **privates);
-
-Bool glxInitVisuals(int *nvisualp, VisualPtr *visualp,
-			 VisualID *defaultVisp,
-			 int ndepth, DepthPtr pdepth,
-			 int rootDepth);
-
-#endif
+/*

+ * SGI FREE SOFTWARE LICENSE B (Version 2.0, Sept. 18, 2008)

+ * Copyright (C) 1991-2000 Silicon Graphics, Inc. All Rights Reserved.

+ *

+ * 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 including the dates of first publication and

+ * either this permission notice or a reference to

+ * http://oss.sgi.com/projects/FreeB/

+ * 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

+ * SILICON GRAPHICS, INC. 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 Silicon Graphics, Inc.

+ * shall not be used in advertising or otherwise to promote the sale, use or

+ * other dealings in this Software without prior written authorization from

+ * Silicon Graphics, Inc.

+ */

+

+#ifndef _GLX_VISUALS_H

+#define _GLX_VISUALS_H

+

+int glxVisualsMatch( __GLXvisualConfig *v1, __GLXvisualConfig *v2 );

+

+VisualID glxMatchGLXVisualInConfigList( __GLXvisualConfig *pGlxVisual, __GLXvisualConfig *configs, int nconfigs );

+

+VisualID glxMatchVisualInConfigList( ScreenPtr pScreen, VisualPtr pVisual, __GLXvisualConfig *configs, int nconfigs );

+

+VisualPtr glxMatchVisual( ScreenPtr pScreen, VisualPtr pVisual, ScreenPtr pMatchScreen );

+

+#endif

diff --git a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
index 1af525e49..50ea6ca9e 100644
--- a/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
+++ b/xorg-server/hw/xfree86/common/xf86VGAarbiter.c
@@ -53,7 +53,6 @@ static GCOps VGAarbiterGCOps = {
     VGAarbiterPolyFillArc, VGAarbiterPolyText8, VGAarbiterPolyText16,

     VGAarbiterImageText8, VGAarbiterImageText16, VGAarbiterImageGlyphBlt,

     VGAarbiterPolyGlyphBlt, VGAarbiterPushPixels,

-    {NULL}      /* devPrivate */

 };

 

 static miPointerSpriteFuncRec VGAarbiterSpriteFuncs = {

@@ -574,9 +573,7 @@ VGAarbiterCreateGC(GCPtr pGC)
     Bool         ret;

 

     SCREEN_PROLOG(CreateGC);

-    VGAGet(pScreen);

     ret = (*pScreen->CreateGC)(pGC);

-    VGAPut();

     GC_WRAP(pGC);

     SCREEN_EPILOG(CreateGC,VGAarbiterCreateGC);

 

@@ -1123,7 +1120,7 @@ void xf86VGAarbiterLock(ScrnInfoPtr pScrn) {}
 void xf86VGAarbiterUnlock(ScrnInfoPtr pScrn) {}

 Bool xf86VGAarbiterAllowDRI(ScreenPtr pScreen) { return TRUE; }

 void xf86VGAarbiterScrnInit(ScrnInfoPtr pScrn) {}

-void xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn) {}

+void xf86VGAarbiterDeviceDecodes(ScrnInfoPtr pScrn, int rsrc) {}

 Bool xf86VGAarbiterWrapFunctions(void) { return FALSE; }

 

 #endif

diff --git a/xorg-server/hw/xfree86/loader/sdksyms.sh b/xorg-server/hw/xfree86/loader/sdksyms.sh
index 6fce0ec2e..ca1474371 100644
--- a/xorg-server/hw/xfree86/loader/sdksyms.sh
+++ b/xorg-server/hw/xfree86/loader/sdksyms.sh
@@ -178,7 +178,6 @@ cat > sdksyms.c << EOF
 #include "xaa.h"

 #include "xaalocal.h"

 #include "xaarop.h"

-#include "xaaWrapper.h"

  */

 

 

diff --git a/xorg-server/hw/xfree86/shadowfb/shadow.c b/xorg-server/hw/xfree86/shadowfb/shadow.c
index 20e70d6ce..741d6a1b7 100644
--- a/xorg-server/hw/xfree86/shadowfb/shadow.c
+++ b/xorg-server/hw/xfree86/shadowfb/shadow.c
@@ -1730,6 +1730,5 @@ GCOps ShadowGCOps = {
     ShadowPolyText16, ShadowImageText8, 

     ShadowImageText16, ShadowImageGlyphBlt, 

     ShadowPolyGlyphBlt, ShadowPushPixels,

-    {NULL}		/* devPrivate */

 };

 

diff --git a/xorg-server/hw/xfree86/xaa/Makefile.am b/xorg-server/hw/xfree86/xaa/Makefile.am
index e9f5e687c..ccba713a6 100644
--- a/xorg-server/hw/xfree86/xaa/Makefile.am
+++ b/xorg-server/hw/xfree86/xaa/Makefile.am
@@ -1,74 +1,74 @@
-LSB_FIRST = l-xaaBitmap.c l-xaaStipple.c l-xaaTEGlyph.c
-LSB_3_FIRST = l3-xaaBitmap.c l3-xaaStipple.c
-MSB_FIRST = m-xaaBitmap.c m-xaaStipple.c m-xaaTEGlyph.c
-MSB_3_FIRST = m3-xaaBitmap.c m3-xaaStipple.c
-LSB_FIXED = lf-xaaBitmap.c lf-xaaStipple.c lf-xaaTEGlyph.c
-LSB_3_FIXED = lf3-xaaBitmap.c lf3-xaaStipple.c
-MSB_FIXED = mf-xaaBitmap.c mf-xaaStipple.c mf-xaaTEGlyph.c
-MSB_3_FIXED = mf3-xaaBitmap.c mf3-xaaStipple.c
-POLYSEG = s-xaaLine.c s-xaaDashLine.c
-
-libxaa_la_LDFLAGS = -avoid-version
-if COMPOSITE
-libxaa_la_LIBADD = $(top_builddir)/miext/cw/libcw.la
-endif
-
-module_LTLIBRARIES = libxaa.la
-libxaa_la_SOURCES = xaaInit.c xaaGC.c xaaInitAccel.c xaaFallback.c \
-                   xaaBitBlt.c xaaCpyArea.c xaaGCmisc.c xaaCpyWin.c \
-                   xaaCpyPlane.c xaaFillRect.c xaaTEText.c xaaNonTEText.c \
-                   xaaPCache.c xaaSpans.c xaaROP.c xaaImage.c xaaWrapper.c \
-                   xaaRect.c xaaLineMisc.c xaaBitOrder.c \
-                   xaaFillPoly.c xaaWideLine.c xaaTables.c xaaFillArc.c \
-                   xaaLine.c xaaDashLine.c xaaOverlay.c xaaOffscreen.c \
-                   xaaOverlayDF.c xaaStateChange.c xaaPict.c $(POLYSEG) \
-                   $(LSB_FIRST) $(MSB_FIRST) $(LSB_FIXED) $(MSB_FIXED) \
-                   $(LSB_3_FIRST) $(MSB_3_FIRST) $(LSB_3_FIXED) $(MSB_3_FIXED)
-${POLYSEG}:
-	echo "#define POLYSEGMENT" > $@
-	echo '#include "$(srcdir)/${@:s-%=%}"' >> $@
-${LSB_FIRST}:
-	echo "#define LSBFIRST" > $@
-	echo '#include "$(srcdir)/${@:l-%=%}"' >> $@
-${LSB_3_FIRST}:
-	echo "#define LSBFIRST" > $@
-	echo "#define TRIPLE_BITS" >> $@
-	echo '#include "$(srcdir)/${@:l3-%=%}"' >> $@
-${LSB_FIXED}:
-	echo "#define LSBFIRST" > $@
-	echo "#define FIXEDBASE" >> $@
-	echo '#include "$(srcdir)/${@:lf-%=%}"' >> $@
-${LSB_3_FIXED}:
-	echo "#define LSBFIRST" > $@
-	echo "#define TRIPLE_BITS" >> $@
-	echo "#define FIXEDBASE" >> $@
-	echo '#include "$(srcdir)/${@:lf3-%=%}"' >> $@
-${MSB_FIRST}:
-	echo "#define MSBFIRST" > $@
-	echo '#include "$(srcdir)/${@:m-%=%}"' >> $@
-${MSB_3_FIRST}:
-	echo "#define MSBFIRST" > $@
-	echo "#define TRIPLE_BITS" >> $@
-	echo '#include "$(srcdir)/${@:m3-%=%}"' >> $@
-${MSB_FIXED}:
-	echo "#define MSBFIRST" > $@
-	echo "#define FIXEDBASE" >> $@
-	echo '#include "$(srcdir)/${@:mf-%=%}"' >> $@
-${MSB_3_FIXED}:
-	echo "#define MSBFIRST" > $@
-	echo "#define TRIPLE_BITS" >> $@
-	echo "#define FIXEDBASE" >> $@
-	echo '#include "$(srcdir)/${@:mf3-%=%}"' >> $@
-
-DISTCLEANFILES = $(POLYSEG) \
-	$(LSB_FIRST) $(LSB_FIXED) $(MSB_FIRST) $(MSB_FIXED) \
-	$(LSB_3_FIRST) $(LSB_3_FIXED) $(MSB_3_FIRST) $(MSB_3_FIXED)
-
-sdk_HEADERS = xaa.h xaalocal.h xaarop.h xaaWrapper.h
-EXTRA_DIST = xaacexp.h xaawrap.h xaaLine.c xaaDashLine.c \
-             xaaStipple.c xaaTEGlyph.c xaaNonTEGlyph.c xaaBitmap.c \
-             XAA.HOWTO
-
-INCLUDES = $(XORG_INCS) -I$(srcdir)/../../../miext/cw
-
-AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)
+LSB_FIRST = l-xaaBitmap.c l-xaaStipple.c l-xaaTEGlyph.c

+LSB_3_FIRST = l3-xaaBitmap.c l3-xaaStipple.c

+MSB_FIRST = m-xaaBitmap.c m-xaaStipple.c m-xaaTEGlyph.c

+MSB_3_FIRST = m3-xaaBitmap.c m3-xaaStipple.c

+LSB_FIXED = lf-xaaBitmap.c lf-xaaStipple.c lf-xaaTEGlyph.c

+LSB_3_FIXED = lf3-xaaBitmap.c lf3-xaaStipple.c

+MSB_FIXED = mf-xaaBitmap.c mf-xaaStipple.c mf-xaaTEGlyph.c

+MSB_3_FIXED = mf3-xaaBitmap.c mf3-xaaStipple.c

+POLYSEG = s-xaaLine.c s-xaaDashLine.c

+

+libxaa_la_LDFLAGS = -avoid-version

+if COMPOSITE

+libxaa_la_LIBADD = $(top_builddir)/miext/cw/libcw.la

+endif

+

+module_LTLIBRARIES = libxaa.la

+libxaa_la_SOURCES = xaaInit.c xaaGC.c xaaInitAccel.c xaaFallback.c \

+                   xaaBitBlt.c xaaCpyArea.c xaaGCmisc.c xaaCpyWin.c \

+                   xaaCpyPlane.c xaaFillRect.c xaaTEText.c xaaNonTEText.c \

+                   xaaPCache.c xaaSpans.c xaaROP.c xaaImage.c \

+                   xaaRect.c xaaLineMisc.c xaaBitOrder.c \

+                   xaaFillPoly.c xaaWideLine.c xaaTables.c xaaFillArc.c \

+                   xaaLine.c xaaDashLine.c xaaOverlay.c xaaOffscreen.c \

+                   xaaOverlayDF.c xaaStateChange.c xaaPict.c $(POLYSEG) \

+                   $(LSB_FIRST) $(MSB_FIRST) $(LSB_FIXED) $(MSB_FIXED) \

+                   $(LSB_3_FIRST) $(MSB_3_FIRST) $(LSB_3_FIXED) $(MSB_3_FIXED)

+${POLYSEG}:

+	echo "#define POLYSEGMENT" > $@

+	echo '#include "$(srcdir)/${@:s-%=%}"' >> $@

+${LSB_FIRST}:

+	echo "#define LSBFIRST" > $@

+	echo '#include "$(srcdir)/${@:l-%=%}"' >> $@

+${LSB_3_FIRST}:

+	echo "#define LSBFIRST" > $@

+	echo "#define TRIPLE_BITS" >> $@

+	echo '#include "$(srcdir)/${@:l3-%=%}"' >> $@

+${LSB_FIXED}:

+	echo "#define LSBFIRST" > $@

+	echo "#define FIXEDBASE" >> $@

+	echo '#include "$(srcdir)/${@:lf-%=%}"' >> $@

+${LSB_3_FIXED}:

+	echo "#define LSBFIRST" > $@

+	echo "#define TRIPLE_BITS" >> $@

+	echo "#define FIXEDBASE" >> $@

+	echo '#include "$(srcdir)/${@:lf3-%=%}"' >> $@

+${MSB_FIRST}:

+	echo "#define MSBFIRST" > $@

+	echo '#include "$(srcdir)/${@:m-%=%}"' >> $@

+${MSB_3_FIRST}:

+	echo "#define MSBFIRST" > $@

+	echo "#define TRIPLE_BITS" >> $@

+	echo '#include "$(srcdir)/${@:m3-%=%}"' >> $@

+${MSB_FIXED}:

+	echo "#define MSBFIRST" > $@

+	echo "#define FIXEDBASE" >> $@

+	echo '#include "$(srcdir)/${@:mf-%=%}"' >> $@

+${MSB_3_FIXED}:

+	echo "#define MSBFIRST" > $@

+	echo "#define TRIPLE_BITS" >> $@

+	echo "#define FIXEDBASE" >> $@

+	echo '#include "$(srcdir)/${@:mf3-%=%}"' >> $@

+

+DISTCLEANFILES = $(POLYSEG) \

+	$(LSB_FIRST) $(LSB_FIXED) $(MSB_FIRST) $(MSB_FIXED) \

+	$(LSB_3_FIRST) $(LSB_3_FIXED) $(MSB_3_FIRST) $(MSB_3_FIXED)

+

+sdk_HEADERS = xaa.h xaalocal.h xaarop.h

+EXTRA_DIST = xaacexp.h xaawrap.h xaaLine.c xaaDashLine.c \

+             xaaStipple.c xaaTEGlyph.c xaaNonTEGlyph.c xaaBitmap.c \

+             XAA.HOWTO

+

+INCLUDES = $(XORG_INCS) -I$(srcdir)/../../../miext/cw

+

+AM_CFLAGS = $(DIX_CFLAGS) $(XORG_CFLAGS)

diff --git a/xorg-server/hw/xfree86/xaa/xaaFallback.c b/xorg-server/hw/xfree86/xaa/xaaFallback.c
index 7ab4031f8..744fd0a21 100644
--- a/xorg-server/hw/xfree86/xaa/xaaFallback.c
+++ b/xorg-server/hw/xfree86/xaa/xaaFallback.c
@@ -1,352 +1,351 @@
-
-#ifdef HAVE_XORG_CONFIG_H
-#include <xorg-config.h>
-#endif
-
-#include "misc.h"
-#include "xf86.h"
-#include "xf86_OSproc.h"
-
-#include <X11/X.h>
-#include "scrnintstr.h"
-#include "xf86str.h"
-#include "xaa.h"
-#include "xaalocal.h"
-#include "gcstruct.h"
-#include "pixmapstr.h"
-#include "xaawrap.h"
-
-
-
-static void
-XAAFillSpansFallback(
-    DrawablePtr pDraw,
-    GC		*pGC,
-    int		nInit,	
-    DDXPointPtr pptInit,	
-    int *pwidthInit,		
-    int fSorted )
-{
-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
-    SYNC_CHECK(pGC);
-    (*pGC->ops->FillSpans)(pDraw, pGC, nInit, pptInit, pwidthInit, fSorted);
-    XAA_GC_OP_EPILOGUE(pGC);
-}
-
-static void
-XAASetSpansFallback(
-    DrawablePtr		pDraw,
-    GCPtr		pGC,
-    char		*pcharsrc,
-    register DDXPointPtr ppt,
-    int			*pwidth,
-    int			nspans,
-    int			fSorted )
-{
-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
-    SYNC_CHECK(pGC);
-    (*pGC->ops->SetSpans)(pDraw, pGC, pcharsrc, ppt, pwidth, nspans, fSorted);
-    XAA_GC_OP_EPILOGUE(pGC);
-}
-
-static void
-XAAPutImageFallback(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		depth, 
-    int x, int y, int w, int h,
-    int		leftPad,
-    int		format,
-    char 	*pImage )
-{
-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
-    SYNC_CHECK(pGC);
-    (*pGC->ops->PutImage)(pDraw, pGC, depth, x, y, w, h, 
-		leftPad, format, pImage);
-    XAA_GC_OP_EPILOGUE(pGC);
-}
-
-static RegionPtr
-XAACopyAreaFallback(
-    DrawablePtr pSrc,
-    DrawablePtr pDst,
-    GC *pGC,
-    int srcx, int srcy,
-    int width, int height,
-    int dstx, int dsty )
-{
-    RegionPtr ret;
-
-    XAA_GC_OP_PROLOGUE(pGC);
-    if((pSrc->type == DRAWABLE_WINDOW) || (pDst->type == DRAWABLE_WINDOW) ||
-	IS_OFFSCREEN_PIXMAP(pSrc) || IS_OFFSCREEN_PIXMAP(pDst)) {
-	SYNC_CHECK(pGC);
-    }
-    ret = (*pGC->ops->CopyArea)(pSrc, pDst,
-            pGC, srcx, srcy, width, height, dstx, dsty);
-    XAA_GC_OP_EPILOGUE(pGC);
-    return ret;
-}
-
-static RegionPtr
-XAACopyPlaneFallback(
-    DrawablePtr	pSrc,
-    DrawablePtr	pDst,
-    GCPtr pGC,
-    int	srcx, int srcy,
-    int	width, int height,
-    int	dstx, int dsty,
-    unsigned long bitPlane )
-{
-    RegionPtr ret;
-
-    XAA_GC_OP_PROLOGUE(pGC);
-    if((pSrc->type == DRAWABLE_WINDOW) || (pDst->type == DRAWABLE_WINDOW) ||
-	IS_OFFSCREEN_PIXMAP(pSrc) || IS_OFFSCREEN_PIXMAP(pDst)) {
-	SYNC_CHECK(pGC);
-    }
-    ret = (*pGC->ops->CopyPlane)(pSrc, pDst,
-	       pGC, srcx, srcy, width, height, dstx, dsty, bitPlane);
-    XAA_GC_OP_EPILOGUE(pGC);
-    return ret;
-}
-
-static void
-XAAPolyPointFallback(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int mode,
-    int npt,
-    xPoint *pptInit )
-{
-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
-    SYNC_CHECK(pGC);
-    (*pGC->ops->PolyPoint)(pDraw, pGC, mode, npt, pptInit);
-    XAA_GC_OP_EPILOGUE(pGC);
-}
-
-
-static void
-XAAPolylinesFallback(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		mode,		
-    int		npt,		
-    DDXPointPtr pptInit )
-{
-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
-    SYNC_CHECK(pGC);
-    (*pGC->ops->Polylines)(pDraw, pGC, mode, npt, pptInit);
-    XAA_GC_OP_EPILOGUE(pGC);
-}
-
-static void 
-XAAPolySegmentFallback(
-    DrawablePtr	pDraw,
-    GCPtr	pGC,
-    int		nseg,
-    xSegment	*pSeg )
-{
-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
-    SYNC_CHECK(pGC);
-    (*pGC->ops->PolySegment)(pDraw, pGC, nseg, pSeg);
-    XAA_GC_OP_EPILOGUE(pGC);
-}
-
-static void
-XAAPolyRectangleFallback(
-    DrawablePtr  pDraw,
-    GCPtr        pGC,
-    int	         nRectsInit,
-    xRectangle  *pRectsInit )
-{
-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
-    SYNC_CHECK(pGC);
-    (*pGC->ops->PolyRectangle)(pDraw, pGC, nRectsInit, pRectsInit);
-    XAA_GC_OP_EPILOGUE(pGC);
-}
-
-static void
-XAAPolyArcFallback(
-    DrawablePtr	pDraw,
-    GCPtr	pGC,
-    int		narcs,
-    xArc	*parcs )
-{
-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
-    SYNC_CHECK(pGC);
-    (*pGC->ops->PolyArc)(pDraw, pGC, narcs, parcs);
-    XAA_GC_OP_EPILOGUE(pGC);
-}
-
-static void
-XAAFillPolygonFallback(
-    DrawablePtr	pDraw,
-    GCPtr	pGC,
-    int		shape,
-    int		mode,
-    int		count,
-    DDXPointPtr	ptsIn )
-{
-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
-    SYNC_CHECK(pGC);
-    (*pGC->ops->FillPolygon)(pDraw, pGC, shape, mode, count, ptsIn);
-    XAA_GC_OP_EPILOGUE(pGC);
-}
-
-
-static void 
-XAAPolyFillRectFallback(
-    DrawablePtr	pDraw,
-    GCPtr	pGC,
-    int		nrectFill, 
-    xRectangle	*prectInit )  
-{
-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
-    SYNC_CHECK(pGC);
-    (*pGC->ops->PolyFillRect)(pDraw, pGC, nrectFill, prectInit);
-    XAA_GC_OP_EPILOGUE(pGC);
-}
-
-
-static void
-XAAPolyFillArcFallback(
-    DrawablePtr	pDraw,
-    GCPtr	pGC,
-    int		narcs,
-    xArc	*parcs )
-{
-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
-    SYNC_CHECK(pGC);
-    (*pGC->ops->PolyFillArc)(pDraw, pGC, narcs, parcs);
-    XAA_GC_OP_EPILOGUE(pGC);
-}
-
-static int
-XAAPolyText8Fallback(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		x, 
-    int 	y,
-    int 	count,
-    char	*chars )
-{
-    int ret;
-
-    XAA_GC_OP_PROLOGUE(pGC);
-    SYNC_CHECK(pGC);
-    ret = (*pGC->ops->PolyText8)(pDraw, pGC, x, y, count, chars);
-    XAA_GC_OP_EPILOGUE(pGC);
-    return ret;
-}
-
-static int
-XAAPolyText16Fallback(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		x,
-    int		y,
-    int 	count,
-    unsigned short *chars )
-{
-    int ret;
-
-    XAA_GC_OP_PROLOGUE(pGC);
-    SYNC_CHECK(pGC);
-    ret = (*pGC->ops->PolyText16)(pDraw, pGC, x, y, count, chars);
-    XAA_GC_OP_EPILOGUE(pGC);
-    return ret;
-}
-
-static void
-XAAImageText8Fallback(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		x, 
-    int		y,
-    int 	count,
-    char	*chars )
-{
-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
-    SYNC_CHECK(pGC);
-    (*pGC->ops->ImageText8)(pDraw, pGC, x, y, count, chars);
-    XAA_GC_OP_EPILOGUE(pGC);
-}
-
-static void
-XAAImageText16Fallback(
-    DrawablePtr pDraw,
-    GCPtr	pGC,
-    int		x,
-    int		y,
-    int 	count,
-    unsigned short *chars )
-{
-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
-    SYNC_CHECK(pGC);
-    (*pGC->ops->ImageText16)(pDraw, pGC, x, y, count, chars);
-    XAA_GC_OP_EPILOGUE(pGC);
-}
-
-
-static void
-XAAImageGlyphBltFallback(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int xInit, int yInit,
-    unsigned int nglyph,
-    CharInfoPtr *ppci,
-    pointer pglyphBase )
-{
-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
-    SYNC_CHECK(pGC);
-    (*pGC->ops->ImageGlyphBlt)(pDraw, pGC, xInit, yInit, nglyph, ppci, pglyphBase);
-    XAA_GC_OP_EPILOGUE(pGC);
-}
-
-static void
-XAAPolyGlyphBltFallback(
-    DrawablePtr pDraw,
-    GCPtr pGC,
-    int xInit, int yInit,
-    unsigned int nglyph,
-    CharInfoPtr *ppci,
-    pointer pglyphBase )
-{
-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
-    SYNC_CHECK(pGC);
-    (*pGC->ops->PolyGlyphBlt)(pDraw, pGC, xInit, yInit, nglyph, ppci, pglyphBase);
-    XAA_GC_OP_EPILOGUE(pGC);
-}
-
-static void
-XAAPushPixelsFallback(
-    GCPtr	pGC,
-    PixmapPtr	pBitMap,
-    DrawablePtr pDraw,
-    int	dx, int dy, int xOrg, int yOrg )
-{
-    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);
-    SYNC_CHECK(pGC);
-    (*pGC->ops->PushPixels)(pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);
-    XAA_GC_OP_EPILOGUE(pGC);
-}
-
-GCOps XAAFallbackOps = {
-    XAAFillSpansFallback, XAASetSpansFallback, 
-    XAAPutImageFallback, XAACopyAreaFallback, 
-    XAACopyPlaneFallback, XAAPolyPointFallback, 
-    XAAPolylinesFallback, XAAPolySegmentFallback, 
-    XAAPolyRectangleFallback, XAAPolyArcFallback, 
-    XAAFillPolygonFallback, XAAPolyFillRectFallback, 
-    XAAPolyFillArcFallback, XAAPolyText8Fallback, 
-    XAAPolyText16Fallback, XAAImageText8Fallback, 
-    XAAImageText16Fallback, XAAImageGlyphBltFallback, 
-    XAAPolyGlyphBltFallback, XAAPushPixelsFallback,
-    {NULL}		/* devPrivate */
-};
-
-GCOps *XAAGetFallbackOps(void)
-{
-    return &XAAFallbackOps;
-}
+

+#ifdef HAVE_XORG_CONFIG_H

+#include <xorg-config.h>

+#endif

+

+#include "misc.h"

+#include "xf86.h"

+#include "xf86_OSproc.h"

+

+#include <X11/X.h>

+#include "scrnintstr.h"

+#include "xf86str.h"

+#include "xaa.h"

+#include "xaalocal.h"

+#include "gcstruct.h"

+#include "pixmapstr.h"

+#include "xaawrap.h"

+

+

+

+static void

+XAAFillSpansFallback(

+    DrawablePtr pDraw,

+    GC		*pGC,

+    int		nInit,	

+    DDXPointPtr pptInit,	

+    int *pwidthInit,		

+    int fSorted )

+{

+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

+    SYNC_CHECK(pGC);

+    (*pGC->ops->FillSpans)(pDraw, pGC, nInit, pptInit, pwidthInit, fSorted);

+    XAA_GC_OP_EPILOGUE(pGC);

+}

+

+static void

+XAASetSpansFallback(

+    DrawablePtr		pDraw,

+    GCPtr		pGC,

+    char		*pcharsrc,

+    register DDXPointPtr ppt,

+    int			*pwidth,

+    int			nspans,

+    int			fSorted )

+{

+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

+    SYNC_CHECK(pGC);

+    (*pGC->ops->SetSpans)(pDraw, pGC, pcharsrc, ppt, pwidth, nspans, fSorted);

+    XAA_GC_OP_EPILOGUE(pGC);

+}

+

+static void

+XAAPutImageFallback(

+    DrawablePtr pDraw,

+    GCPtr	pGC,

+    int		depth, 

+    int x, int y, int w, int h,

+    int		leftPad,

+    int		format,

+    char 	*pImage )

+{

+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

+    SYNC_CHECK(pGC);

+    (*pGC->ops->PutImage)(pDraw, pGC, depth, x, y, w, h, 

+		leftPad, format, pImage);

+    XAA_GC_OP_EPILOGUE(pGC);

+}

+

+static RegionPtr

+XAACopyAreaFallback(

+    DrawablePtr pSrc,

+    DrawablePtr pDst,

+    GC *pGC,

+    int srcx, int srcy,

+    int width, int height,

+    int dstx, int dsty )

+{

+    RegionPtr ret;

+

+    XAA_GC_OP_PROLOGUE(pGC);

+    if((pSrc->type == DRAWABLE_WINDOW) || (pDst->type == DRAWABLE_WINDOW) ||

+	IS_OFFSCREEN_PIXMAP(pSrc) || IS_OFFSCREEN_PIXMAP(pDst)) {

+	SYNC_CHECK(pGC);

+    }

+    ret = (*pGC->ops->CopyArea)(pSrc, pDst,

+            pGC, srcx, srcy, width, height, dstx, dsty);

+    XAA_GC_OP_EPILOGUE(pGC);

+    return ret;

+}

+

+static RegionPtr

+XAACopyPlaneFallback(

+    DrawablePtr	pSrc,

+    DrawablePtr	pDst,

+    GCPtr pGC,

+    int	srcx, int srcy,

+    int	width, int height,

+    int	dstx, int dsty,

+    unsigned long bitPlane )

+{

+    RegionPtr ret;

+

+    XAA_GC_OP_PROLOGUE(pGC);

+    if((pSrc->type == DRAWABLE_WINDOW) || (pDst->type == DRAWABLE_WINDOW) ||

+	IS_OFFSCREEN_PIXMAP(pSrc) || IS_OFFSCREEN_PIXMAP(pDst)) {

+	SYNC_CHECK(pGC);

+    }

+    ret = (*pGC->ops->CopyPlane)(pSrc, pDst,

+	       pGC, srcx, srcy, width, height, dstx, dsty, bitPlane);

+    XAA_GC_OP_EPILOGUE(pGC);

+    return ret;

+}

+

+static void

+XAAPolyPointFallback(

+    DrawablePtr pDraw,

+    GCPtr pGC,

+    int mode,

+    int npt,

+    xPoint *pptInit )

+{

+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

+    SYNC_CHECK(pGC);

+    (*pGC->ops->PolyPoint)(pDraw, pGC, mode, npt, pptInit);

+    XAA_GC_OP_EPILOGUE(pGC);

+}

+

+

+static void

+XAAPolylinesFallback(

+    DrawablePtr pDraw,

+    GCPtr	pGC,

+    int		mode,		

+    int		npt,		

+    DDXPointPtr pptInit )

+{

+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

+    SYNC_CHECK(pGC);

+    (*pGC->ops->Polylines)(pDraw, pGC, mode, npt, pptInit);

+    XAA_GC_OP_EPILOGUE(pGC);

+}

+

+static void 

+XAAPolySegmentFallback(

+    DrawablePtr	pDraw,

+    GCPtr	pGC,

+    int		nseg,

+    xSegment	*pSeg )

+{

+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

+    SYNC_CHECK(pGC);

+    (*pGC->ops->PolySegment)(pDraw, pGC, nseg, pSeg);

+    XAA_GC_OP_EPILOGUE(pGC);

+}

+

+static void

+XAAPolyRectangleFallback(

+    DrawablePtr  pDraw,

+    GCPtr        pGC,

+    int	         nRectsInit,

+    xRectangle  *pRectsInit )

+{

+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

+    SYNC_CHECK(pGC);

+    (*pGC->ops->PolyRectangle)(pDraw, pGC, nRectsInit, pRectsInit);

+    XAA_GC_OP_EPILOGUE(pGC);

+}

+

+static void

+XAAPolyArcFallback(

+    DrawablePtr	pDraw,

+    GCPtr	pGC,

+    int		narcs,

+    xArc	*parcs )

+{

+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

+    SYNC_CHECK(pGC);

+    (*pGC->ops->PolyArc)(pDraw, pGC, narcs, parcs);

+    XAA_GC_OP_EPILOGUE(pGC);

+}

+

+static void

+XAAFillPolygonFallback(

+    DrawablePtr	pDraw,

+    GCPtr	pGC,

+    int		shape,

+    int		mode,

+    int		count,

+    DDXPointPtr	ptsIn )

+{

+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

+    SYNC_CHECK(pGC);

+    (*pGC->ops->FillPolygon)(pDraw, pGC, shape, mode, count, ptsIn);

+    XAA_GC_OP_EPILOGUE(pGC);

+}

+

+

+static void 

+XAAPolyFillRectFallback(

+    DrawablePtr	pDraw,

+    GCPtr	pGC,

+    int		nrectFill, 

+    xRectangle	*prectInit )  

+{

+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

+    SYNC_CHECK(pGC);

+    (*pGC->ops->PolyFillRect)(pDraw, pGC, nrectFill, prectInit);

+    XAA_GC_OP_EPILOGUE(pGC);

+}

+

+

+static void

+XAAPolyFillArcFallback(

+    DrawablePtr	pDraw,

+    GCPtr	pGC,

+    int		narcs,

+    xArc	*parcs )

+{

+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

+    SYNC_CHECK(pGC);

+    (*pGC->ops->PolyFillArc)(pDraw, pGC, narcs, parcs);

+    XAA_GC_OP_EPILOGUE(pGC);

+}

+

+static int

+XAAPolyText8Fallback(

+    DrawablePtr pDraw,

+    GCPtr	pGC,

+    int		x, 

+    int 	y,

+    int 	count,

+    char	*chars )

+{

+    int ret;

+

+    XAA_GC_OP_PROLOGUE(pGC);

+    SYNC_CHECK(pGC);

+    ret = (*pGC->ops->PolyText8)(pDraw, pGC, x, y, count, chars);

+    XAA_GC_OP_EPILOGUE(pGC);

+    return ret;

+}

+

+static int

+XAAPolyText16Fallback(

+    DrawablePtr pDraw,

+    GCPtr	pGC,

+    int		x,

+    int		y,

+    int 	count,

+    unsigned short *chars )

+{

+    int ret;

+

+    XAA_GC_OP_PROLOGUE(pGC);

+    SYNC_CHECK(pGC);

+    ret = (*pGC->ops->PolyText16)(pDraw, pGC, x, y, count, chars);

+    XAA_GC_OP_EPILOGUE(pGC);

+    return ret;

+}

+

+static void

+XAAImageText8Fallback(

+    DrawablePtr pDraw,

+    GCPtr	pGC,

+    int		x, 

+    int		y,

+    int 	count,

+    char	*chars )

+{

+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

+    SYNC_CHECK(pGC);

+    (*pGC->ops->ImageText8)(pDraw, pGC, x, y, count, chars);

+    XAA_GC_OP_EPILOGUE(pGC);

+}

+

+static void

+XAAImageText16Fallback(

+    DrawablePtr pDraw,

+    GCPtr	pGC,

+    int		x,

+    int		y,

+    int 	count,

+    unsigned short *chars )

+{

+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

+    SYNC_CHECK(pGC);

+    (*pGC->ops->ImageText16)(pDraw, pGC, x, y, count, chars);

+    XAA_GC_OP_EPILOGUE(pGC);

+}

+

+

+static void

+XAAImageGlyphBltFallback(

+    DrawablePtr pDraw,

+    GCPtr pGC,

+    int xInit, int yInit,

+    unsigned int nglyph,

+    CharInfoPtr *ppci,

+    pointer pglyphBase )

+{

+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

+    SYNC_CHECK(pGC);

+    (*pGC->ops->ImageGlyphBlt)(pDraw, pGC, xInit, yInit, nglyph, ppci, pglyphBase);

+    XAA_GC_OP_EPILOGUE(pGC);

+}

+

+static void

+XAAPolyGlyphBltFallback(

+    DrawablePtr pDraw,

+    GCPtr pGC,

+    int xInit, int yInit,

+    unsigned int nglyph,

+    CharInfoPtr *ppci,

+    pointer pglyphBase )

+{

+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

+    SYNC_CHECK(pGC);

+    (*pGC->ops->PolyGlyphBlt)(pDraw, pGC, xInit, yInit, nglyph, ppci, pglyphBase);

+    XAA_GC_OP_EPILOGUE(pGC);

+}

+

+static void

+XAAPushPixelsFallback(

+    GCPtr	pGC,

+    PixmapPtr	pBitMap,

+    DrawablePtr pDraw,

+    int	dx, int dy, int xOrg, int yOrg )

+{

+    XAA_GC_OP_PROLOGUE_WITH_RETURN(pGC);

+    SYNC_CHECK(pGC);

+    (*pGC->ops->PushPixels)(pGC, pBitMap, pDraw, dx, dy, xOrg, yOrg);

+    XAA_GC_OP_EPILOGUE(pGC);

+}

+

+GCOps XAAFallbackOps = {

+    XAAFillSpansFallback, XAASetSpansFallback, 

+    XAAPutImageFallback, XAACopyAreaFallback, 

+    XAACopyPlaneFallback, XAAPolyPointFallback, 

+    XAAPolylinesFallback, XAAPolySegmentFallback, 

+    XAAPolyRectangleFallback, XAAPolyArcFallback, 

+    XAAFillPolygonFallback, XAAPolyFillRectFallback, 

+    XAAPolyFillArcFallback, XAAPolyText8Fallback, 

+    XAAPolyText16Fallback, XAAImageText8Fallback, 

+    XAAImageText16Fallback, XAAImageGlyphBltFallback, 

+    XAAPolyGlyphBltFallback, XAAPushPixelsFallback,

+};

+

+GCOps *XAAGetFallbackOps(void)

+{

+    return &XAAFallbackOps;

+}

diff --git a/xorg-server/hw/xfree86/xaa/xaaGC.c b/xorg-server/hw/xfree86/xaa/xaaGC.c
index 4bd3750cb..f9c1070f9 100644
--- a/xorg-server/hw/xfree86/xaa/xaaGC.c
+++ b/xorg-server/hw/xfree86/xaa/xaaGC.c
@@ -48,11 +48,6 @@ XAACreateGC(GCPtr pGC)
 	pGCPriv->wrapOps = NULL;

 	pGCPriv->wrapFuncs = pGC->funcs;

 	pGCPriv->XAAOps = &XAAFallbackOps;

-	pGCPriv->flags = 0;

-	pGCPriv->DashLength = 0;

-	pGCPriv->DashPattern = NULL;

-	pGCPriv->changes = 0;

-	/* initialize any other private fields here */

 	pGC->funcs = &XAAGCFuncs;

     }

  

@@ -651,5 +646,4 @@ GCOps XAAPixmapOps = {
     XAAPolyText16Pixmap, XAAImageText8Pixmap, 

     XAAImageText16Pixmap, XAAImageGlyphBltPixmap, 

     XAAPolyGlyphBltPixmap, XAAPushPixelsPixmap,

-    {NULL}		/* devPrivate */

 };

diff --git a/xorg-server/hw/xfree86/xaa/xaaWrapper.c b/xorg-server/hw/xfree86/xaa/xaaWrapper.c
deleted file mode 100644
index 09644c9ac..000000000
--- a/xorg-server/hw/xfree86/xaa/xaaWrapper.c
+++ /dev/null
@@ -1,477 +0,0 @@
-#ifdef HAVE_XORG_CONFIG_H

-#include <xorg-config.h>

-#endif

-

-#include <X11/X.h>

-#include <X11/Xproto.h>

-#include "scrnintstr.h"

-#include "gcstruct.h"

-#include "glyphstr.h"

-#include "window.h"

-#include "windowstr.h"

-#include "picture.h"

-#include "picturestr.h"

-#include "colormapst.h"

-#include "xaa.h"

-#include "xaalocal.h"

-#include "xaaWrapper.h"

-

-void XAASync(ScreenPtr pScreen);

-

-/* #include "render.h" */

-

-#if 1

-#define COND(pDraw) \

-        ((pDraw)->depth \

-                      != (xaaWrapperGetScrPriv(((DrawablePtr)(pDraw))->pScreen))->depth)

-#else

-#define COND(pDraw) 1

-#endif

-

-static Bool xaaWrapperCreateGC(GCPtr pGC);

-static void xaaWrapperValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDraw);

-static void xaaWrapperDestroyGC(GCPtr pGC);

-static void xaaWrapperChangeGC (GCPtr pGC, unsigned long   mask);

-static void xaaWrapperCopyGC (GCPtr pGCSrc, unsigned long   mask, GCPtr pGCDst);

-static void xaaWrapperChangeClip (GCPtr pGC, int type, pointer pvalue, int nrects);

-

-static void xaaWrapperCopyClip(GCPtr pgcDst, GCPtr pgcSrc);

-static void xaaWrapperDestroyClip(GCPtr pGC);

-

-

-static void

-xaaWrapperComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,

-	     INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask,

-	     INT16 xDst, INT16 yDst, CARD16 width, CARD16 height);

-static void

-xaaWrapperGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst,

-	  PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlist,

-	  GlyphListPtr list, GlyphPtr *glyphs);

-

-

-typedef struct {

-    CloseScreenProcPtr		CloseScreen;

-    CreateScreenResourcesProcPtr CreateScreenResources;

-    CreateWindowProcPtr		CreateWindow;

-    CopyWindowProcPtr		CopyWindow;

-    WindowExposuresProcPtr	WindowExposures;

-    CreateGCProcPtr		CreateGC;

-    CreateColormapProcPtr	CreateColormap;

-    DestroyColormapProcPtr	DestroyColormap;

-    InstallColormapProcPtr	InstallColormap;

-    UninstallColormapProcPtr	UninstallColormap;

-    ListInstalledColormapsProcPtr ListInstalledColormaps;

-    StoreColorsProcPtr		StoreColors;

-    CompositeProcPtr		Composite;

-    GlyphsProcPtr		Glyphs;

-

-    CloseScreenProcPtr		wrapCloseScreen;

-    CreateScreenResourcesProcPtr wrapCreateScreenResources;

-    CreateWindowProcPtr		wrapCreateWindow;

-    CopyWindowProcPtr		wrapCopyWindow;

-    WindowExposuresProcPtr	wrapWindowExposures;

-    CreateGCProcPtr		wrapCreateGC;

-    CreateColormapProcPtr	wrapCreateColormap;

-    DestroyColormapProcPtr	wrapDestroyColormap;

-    InstallColormapProcPtr	wrapInstallColormap;

-    UninstallColormapProcPtr	wrapUninstallColormap;

-    ListInstalledColormapsProcPtr wrapListInstalledColormaps;

-    StoreColorsProcPtr		wrapStoreColors;

-    CompositeProcPtr		wrapComposite;

-    GlyphsProcPtr		wrapGlyphs;

-    int depth;

-} xaaWrapperScrPrivRec, *xaaWrapperScrPrivPtr;

-

-#define xaaWrapperGetScrPriv(s)	((xaaWrapperScrPrivPtr) \

-    dixLookupPrivate(&(s)->devPrivates, xaaWrapperScrPrivateKey))

-#define xaaWrapperScrPriv(s)     xaaWrapperScrPrivPtr pScrPriv = xaaWrapperGetScrPriv(s)

-

-#define wrap(priv,real,mem,func) {\

-    priv->mem = real->mem; \

-    real->mem = func; \

-}

-

-#define unwrap(priv,real,mem) {\

-    real->mem = priv->mem; \

-}

-

-#define cond_wrap(priv,cond,real,mem,wrapmem,func) {\

-    if (COND(cond)) \

-        priv->wrapmem = real->mem; \

-    else  \

-	priv->mem = real->mem; \

-    real->mem = func; \

-}

-

-#define cond_unwrap(priv,cond,real,mem,wrapmem) {\

-    if (COND(cond)) \

-        real->mem = priv->wrapmem; \

-    else \

-        real->mem = priv->mem; \

-}

-

-#define get(priv,real,func,wrap) \

-    priv->wrap = real->func;

-

-typedef struct _xaaWrapperGCPriv {

-    GCOps   *ops;

-    Bool  wrap;

-    GCFuncs *funcs;

-    GCOps   *wrapops;

-} xaaWrapperGCPrivRec, *xaaWrapperGCPrivPtr;

-

-#define xaaWrapperGetGCPriv(pGC) ((xaaWrapperGCPrivPtr) \

-    dixLookupPrivate(&(pGC)->devPrivates, xaaWrapperGCPrivateKey))

-#define xaaWrapperGCPriv(pGC)   xaaWrapperGCPrivPtr  pGCPriv = xaaWrapperGetGCPriv(pGC)

-

-

-static DevPrivateKeyRec xaaWrapperScrPrivateKeyRec;

-#define xaaWrapperScrPrivateKey (&xaaWrapperScrPrivateKeyRec)

-static DevPrivateKeyRec xaaWrapperGCPrivateKeyRec;

-#define xaaWrapperGCPrivateKey (&xaaWrapperGCPrivateKeyRec)

-

-static Bool

-xaaWrapperCreateScreenResources(ScreenPtr pScreen)

-{

-    xaaWrapperScrPriv(pScreen);

-    Bool		ret;

-    

-    unwrap (pScrPriv,pScreen, CreateScreenResources);

-    ret = pScreen->CreateScreenResources(pScreen);

-    wrap(pScrPriv,pScreen,CreateScreenResources,xaaWrapperCreateScreenResources);

-    return ret;

-}

-

-static Bool

-xaaWrapperCloseScreen (int iScreen, ScreenPtr pScreen)

-{

-    xaaWrapperScrPriv(pScreen);

-    Bool		ret;

-

-    unwrap (pScrPriv,pScreen, CloseScreen);

-    ret = pScreen->CloseScreen(iScreen,pScreen);

-    return TRUE;

-}

-

-static Bool

-xaaWrapperCreateWindow(WindowPtr pWin)

-{

-    xaaWrapperScrPriv(pWin->drawable.pScreen);

-    Bool ret;

-    

-    cond_unwrap(pScrPriv, &pWin->drawable, pWin->drawable.pScreen,

-		CreateWindow, wrapCreateWindow);

-    ret = pWin->drawable.pScreen->CreateWindow(pWin);

-    cond_wrap(pScrPriv, &pWin->drawable, pWin->drawable.pScreen, CreateWindow,

-	      wrapCreateWindow, xaaWrapperCreateWindow);

-

-    return ret;

-}

-

-static void

-xaaWrapperCopyWindow(WindowPtr	pWin,

-	     DDXPointRec	ptOldOrg,

-	     RegionPtr	prgnSrc)

-{

-    ScreenPtr		pScreen = pWin->drawable.pScreen;

-    xaaWrapperScrPriv(pScreen);

-    

-    unwrap (pScrPriv, pScreen, CopyWindow);

-#if 0

-    if (COND(&pWin->drawable))

-	pWin->drawable.pScreen->CopyWindow = pScrPriv->wrapCopyWindow;

-#endif

-    pScreen->CopyWindow(pWin, ptOldOrg, prgnSrc);

-    wrap(pScrPriv, pScreen, CopyWindow, xaaWrapperCopyWindow);

-}

-

-static void

-xaaWrapperWindowExposures (WindowPtr	pWin,

-			  RegionPtr	prgn,

-			  RegionPtr	other_exposed)

-{

-    xaaWrapperScrPriv(pWin->drawable.pScreen);

-

-    cond_unwrap(pScrPriv, &pWin->drawable, pWin->drawable.pScreen,

-		WindowExposures, wrapWindowExposures);

-    pWin->drawable.pScreen->WindowExposures(pWin, prgn, other_exposed);

-    cond_wrap(pScrPriv, &pWin->drawable, pWin->drawable.pScreen,

-	      WindowExposures, wrapWindowExposures, xaaWrapperWindowExposures);

-}

-

-static Bool

-xaaWrapperCreateColormap(ColormapPtr pmap)

-{

-    xaaWrapperScrPriv(pmap->pScreen);

-    Bool		ret;

-    unwrap(pScrPriv,pmap->pScreen, CreateColormap);

-    ret = pmap->pScreen->CreateColormap(pmap);

-    wrap(pScrPriv,pmap->pScreen,CreateColormap,xaaWrapperCreateColormap);

-    

-    return ret;

-}

-

-static void

-xaaWrapperDestroyColormap(ColormapPtr pmap)

-{

-    xaaWrapperScrPriv(pmap->pScreen);

-    unwrap(pScrPriv,pmap->pScreen, DestroyColormap);

-    pmap->pScreen->DestroyColormap(pmap);

-    wrap(pScrPriv,pmap->pScreen,DestroyColormap,xaaWrapperDestroyColormap);

-}

-

-static void

-xaaWrapperStoreColors(ColormapPtr pmap, int nColors, xColorItem *pColors)

-{

-    xaaWrapperScrPriv(pmap->pScreen);

-    unwrap(pScrPriv,pmap->pScreen, StoreColors);

-    pmap->pScreen->StoreColors(pmap,nColors,pColors);

-    wrap(pScrPriv,pmap->pScreen,StoreColors,xaaWrapperStoreColors);

-}

-

-static void

-xaaWrapperInstallColormap(ColormapPtr pmap)

-{

-    xaaWrapperScrPriv(pmap->pScreen);

-    

-    unwrap(pScrPriv,pmap->pScreen, InstallColormap);

-    pmap->pScreen->InstallColormap(pmap);

-    wrap(pScrPriv,pmap->pScreen,InstallColormap,xaaWrapperInstallColormap);

-}

-

-static void

-xaaWrapperUninstallColormap(ColormapPtr pmap)

-{

-    xaaWrapperScrPriv(pmap->pScreen);

-

-    unwrap(pScrPriv,pmap->pScreen, UninstallColormap);

-    pmap->pScreen->UninstallColormap(pmap);

-    wrap(pScrPriv,pmap->pScreen,UninstallColormap,xaaWrapperUninstallColormap);

-}

-

-static int

-xaaWrapperListInstalledColormaps(ScreenPtr pScreen, Colormap *pCmapIds)

-{

-    int			n;

-    xaaWrapperScrPriv(pScreen);

-

-    unwrap(pScrPriv,pScreen, ListInstalledColormaps);

-    n = pScreen->ListInstalledColormaps(pScreen, pCmapIds);

-    wrap (pScrPriv,pScreen,ListInstalledColormaps,xaaWrapperListInstalledColormaps);

-    return n;

-}

-

-Bool

-xaaSetupWrapper(ScreenPtr pScreen, XAAInfoRecPtr infoPtr, int depth, SyncFunc *func)

-{

-    Bool ret;

-    xaaWrapperScrPrivPtr pScrPriv;

-    PictureScreenPtr	ps = GetPictureScreenIfSet(pScreen);

-

-    if (!dixRegisterPrivateKey(&xaaWrapperGCPrivateKeyRec, PRIVATE_GC, sizeof(xaaWrapperGCPrivRec)))

-	return FALSE;

-

-    if (!dixRegisterPrivateKey(&xaaWrapperScrPrivateKeyRec, PRIVATE_SCREEN, 0))

-	return FALSE;

-

-    pScrPriv = (xaaWrapperScrPrivPtr) malloc(sizeof (xaaWrapperScrPrivRec));

-    if (!pScrPriv)

-	return FALSE;

-

-    get (pScrPriv, pScreen, CloseScreen, wrapCloseScreen);

-    get (pScrPriv, pScreen, CreateScreenResources, wrapCreateScreenResources);

-    get (pScrPriv, pScreen, CreateWindow, wrapCreateWindow);

-    get (pScrPriv, pScreen, CopyWindow, wrapCopyWindow);

-    get (pScrPriv, pScreen, WindowExposures, wrapWindowExposures);

-    get (pScrPriv, pScreen, CreateGC, wrapCreateGC);

-    get (pScrPriv, pScreen, CreateColormap, wrapCreateColormap);

-    get (pScrPriv, pScreen, DestroyColormap, wrapDestroyColormap);

-    get (pScrPriv, pScreen, InstallColormap, wrapInstallColormap);

-    get (pScrPriv, pScreen, UninstallColormap, wrapUninstallColormap);

-    get (pScrPriv, pScreen, ListInstalledColormaps, wrapListInstalledColormaps);

-    get (pScrPriv, pScreen, StoreColors, wrapStoreColors);

-    if (ps) {

-	get (pScrPriv, ps, Glyphs, wrapGlyphs);

-	get (pScrPriv, ps, Composite, wrapComposite);

-    }

-    if (!(ret = XAAInit(pScreen,infoPtr)))

-	return FALSE;

-    

-    wrap (pScrPriv, pScreen, CloseScreen, xaaWrapperCloseScreen);

-    wrap (pScrPriv, pScreen, CreateScreenResources,

-	  xaaWrapperCreateScreenResources);

-    wrap (pScrPriv, pScreen, CreateWindow, xaaWrapperCreateWindow);

-    wrap (pScrPriv, pScreen, CopyWindow, xaaWrapperCopyWindow);

-    wrap (pScrPriv, pScreen, WindowExposures, xaaWrapperWindowExposures);

-    wrap (pScrPriv, pScreen, CreateGC, xaaWrapperCreateGC);

-    wrap (pScrPriv, pScreen, CreateColormap, xaaWrapperCreateColormap);

-    wrap (pScrPriv, pScreen, DestroyColormap, xaaWrapperDestroyColormap);

-    wrap (pScrPriv, pScreen, InstallColormap, xaaWrapperInstallColormap);

-    wrap (pScrPriv, pScreen, UninstallColormap, xaaWrapperUninstallColormap);

-    wrap (pScrPriv, pScreen, ListInstalledColormaps,

-	  xaaWrapperListInstalledColormaps);

-    wrap (pScrPriv, pScreen, StoreColors, xaaWrapperStoreColors);

-

-    if (ps) {

-	wrap (pScrPriv, ps, Glyphs, xaaWrapperGlyphs);

-	wrap (pScrPriv, ps, Composite, xaaWrapperComposite);

-    }

-    pScrPriv->depth = depth;

-    dixSetPrivate(&pScreen->devPrivates, xaaWrapperScrPrivateKey, pScrPriv);

-

-    *func = XAASync;

-    

-    return ret;

-}

-

-GCFuncs xaaWrapperGCFuncs = {

-    xaaWrapperValidateGC, xaaWrapperChangeGC, xaaWrapperCopyGC,

-    xaaWrapperDestroyGC, xaaWrapperChangeClip, xaaWrapperDestroyClip,

-    xaaWrapperCopyClip

-};

-

-#define XAAWRAPPER_GC_FUNC_PROLOGUE(pGC) \

-    xaaWrapperGCPriv(pGC); \

-    unwrap(pGCPriv, pGC, funcs); \

-    if (pGCPriv->wrap) unwrap(pGCPriv, pGC, ops)

-

-#define XAAWRAPPER_GC_FUNC_EPILOGUE(pGC) \

-    wrap(pGCPriv, pGC, funcs, &xaaWrapperGCFuncs);  \

-    if (pGCPriv->wrap) wrap(pGCPriv, pGC, ops, pGCPriv->wrapops)

-

-static Bool

-xaaWrapperCreateGC(GCPtr pGC)

-{

-    ScreenPtr		pScreen = pGC->pScreen;

-    xaaWrapperScrPriv(pScreen);

-    xaaWrapperGCPriv(pGC);

-    Bool ret;

-

-    unwrap (pScrPriv, pScreen, CreateGC);

-    if((ret = (*pScreen->CreateGC) (pGC))) {

-	pGCPriv->wrap = FALSE;

-	pGCPriv->funcs = pGC->funcs;

-	pGCPriv->wrapops = pGC->ops;

-	pGC->funcs = &xaaWrapperGCFuncs;

-    }

-    wrap (pScrPriv, pScreen, CreateGC, xaaWrapperCreateGC);

-

-    return ret;

-}

-

-static void

-xaaWrapperValidateGC(

-   GCPtr         pGC,

-   unsigned long changes,

-   DrawablePtr   pDraw 

-){

-    XAAWRAPPER_GC_FUNC_PROLOGUE (pGC);

-    (*pGC->funcs->ValidateGC)(pGC, changes, pDraw);

-

-    if(COND(pDraw)) 

-	pGCPriv->wrap = TRUE;

-    

-    XAAWRAPPER_GC_FUNC_EPILOGUE (pGC);

-}

-

-static void

-xaaWrapperDestroyGC(GCPtr pGC)

-{

-    XAAWRAPPER_GC_FUNC_PROLOGUE (pGC);

-    (*pGC->funcs->DestroyGC)(pGC);

-    XAAWRAPPER_GC_FUNC_EPILOGUE (pGC);

-}

-

-static void

-xaaWrapperChangeGC (

-    GCPtr	    pGC,

-    unsigned long   mask

-){

-    XAAWRAPPER_GC_FUNC_PROLOGUE (pGC);

-    (*pGC->funcs->ChangeGC) (pGC, mask);

-    XAAWRAPPER_GC_FUNC_EPILOGUE (pGC);

-}

-

-static void

-xaaWrapperCopyGC (

-    GCPtr	    pGCSrc, 

-    unsigned long   mask,

-    GCPtr	    pGCDst

-){

-    XAAWRAPPER_GC_FUNC_PROLOGUE (pGCDst);

-    (*pGCDst->funcs->CopyGC) (pGCSrc, mask, pGCDst);

-    XAAWRAPPER_GC_FUNC_EPILOGUE (pGCDst);

-}

-

-static void

-xaaWrapperChangeClip (

-    GCPtr   pGC,

-    int		type,

-    pointer	pvalue,

-    int		nrects 

-){

-    XAAWRAPPER_GC_FUNC_PROLOGUE (pGC);

-    (*pGC->funcs->ChangeClip) (pGC, type, pvalue, nrects);

-    XAAWRAPPER_GC_FUNC_EPILOGUE (pGC);

-}

-

-static void

-xaaWrapperCopyClip(GCPtr pgcDst, GCPtr pgcSrc)

-{

-    XAAWRAPPER_GC_FUNC_PROLOGUE (pgcDst);

-    (* pgcDst->funcs->CopyClip)(pgcDst, pgcSrc);

-    XAAWRAPPER_GC_FUNC_EPILOGUE (pgcDst);

-}

-

-static void

-xaaWrapperDestroyClip(GCPtr pGC)

-{

-    XAAWRAPPER_GC_FUNC_PROLOGUE (pGC);

-    (* pGC->funcs->DestroyClip)(pGC);

-    XAAWRAPPER_GC_FUNC_EPILOGUE (pGC);

-}

-

-static void

-xaaWrapperComposite (CARD8 op, PicturePtr pSrc, PicturePtr pMask, PicturePtr pDst,

-	     INT16 xSrc, INT16 ySrc, INT16 xMask, INT16 yMask,

-    INT16 xDst, INT16 yDst, CARD16 width, CARD16 height)

-{

-    ScreenPtr		pScreen = pDst->pDrawable->pScreen;

-    PictureScreenPtr	ps = GetPictureScreen(pScreen);

-    xaaWrapperScrPriv(pScreen);

-

-    unwrap (pScrPriv, ps, Composite);

-    (*ps->Composite) (op, pSrc, pMask, pDst, xSrc, ySrc, xMask, yMask,

-		      xDst, yDst, width, height);

-    wrap (pScrPriv, ps, Composite, xaaWrapperComposite);

-}

-

-

-static void

-xaaWrapperGlyphs (CARD8 op, PicturePtr pSrc, PicturePtr pDst,

-	  PictFormatPtr maskFormat, INT16 xSrc, INT16 ySrc, int nlist,

-	  GlyphListPtr list, GlyphPtr *glyphs)

-{

-    ScreenPtr		pScreen = pDst->pDrawable->pScreen;

-    PictureScreenPtr	ps = GetPictureScreen(pScreen);

-    xaaWrapperScrPriv(pScreen);

-

-    unwrap (pScrPriv, ps, Glyphs);

-    (*ps->Glyphs) (op, pSrc, pDst, maskFormat, xSrc, ySrc,

-		   nlist, list, glyphs);

-    wrap (pScrPriv, ps, Glyphs, xaaWrapperGlyphs);

-

-}

-

-void

-XAASync(ScreenPtr pScreen)

-{

-    XAAScreenPtr pScreenPriv = (XAAScreenPtr)

-	dixLookupPrivate(&pScreen->devPrivates, XAAGetScreenKey());

-    XAAInfoRecPtr infoRec = pScreenPriv->AccelInfoRec;

-

-    if(infoRec->NeedToSync) {

-        (*infoRec->Sync)(infoRec->pScrn);

-        infoRec->NeedToSync = FALSE;

-    }

-}

diff --git a/xorg-server/hw/xfree86/xaa/xaaWrapper.h b/xorg-server/hw/xfree86/xaa/xaaWrapper.h
deleted file mode 100644
index f554741c6..000000000
--- a/xorg-server/hw/xfree86/xaa/xaaWrapper.h
+++ /dev/null
@@ -1,10 +0,0 @@
-
-#ifndef _XAA_WRAPPER_H
-# define _XAA_WRAPPER_H
-
-typedef void (*SyncFunc)(ScreenPtr);
-
-extern _X_EXPORT Bool xaaSetupWrapper(ScreenPtr pScreen,
-		     XAAInfoRecPtr infoPtr, int depth, SyncFunc *func);
-
-#endif
diff --git a/xorg-server/hw/xnest/Color.c b/xorg-server/hw/xnest/Color.c
index bb215fc45..2548f9495 100644
--- a/xorg-server/hw/xnest/Color.c
+++ b/xorg-server/hw/xnest/Color.c
@@ -34,6 +34,8 @@ is" without express or implied warranty.
 #include "XNWindow.h"

 #include "Args.h"

 

+DevPrivateKeyRec xnestColormapPrivateKeyRec;

+

 static DevPrivateKeyRec cmapScrPrivateKeyRec;

 #define cmapScrPrivateKey (&cmapScrPrivateKeyRec)

 

@@ -52,8 +54,6 @@ xnestCreateColormap(ColormapPtr pCmap)
   pVisual = pCmap->pVisual;

   ncolors = pVisual->ColormapEntries;

 

-  pCmap->devPriv = (pointer)malloc(sizeof(xnestPrivColormap));

-  

   xnestColormapPriv(pCmap)->colormap = 

     XCreateColormap(xnestDisplay,

 		    xnestDefaultWindows[pCmap->pScreen->myNum],

@@ -130,7 +130,6 @@ void
 xnestDestroyColormap(ColormapPtr pCmap)

 {

   XFreeColormap(xnestDisplay, xnestColormap(pCmap));

-  free(pCmap->devPriv);

 }

 

 #define SEARCH_PREDICATE \

diff --git a/xorg-server/hw/xnest/Color.h b/xorg-server/hw/xnest/Color.h
index f00bde47f..3c75fef2f 100644
--- a/xorg-server/hw/xnest/Color.h
+++ b/xorg-server/hw/xnest/Color.h
@@ -1,56 +1,57 @@
-/*
-
-Copyright 1993 by Davor Matic
-
-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.  Davor Matic makes no representations about
-the suitability of this software for any purpose.  It is provided "as
-is" without express or implied warranty.
-
-*/
-
-#ifndef XNESTCOLOR_H
-#define XNESTCOLOR_H
-
-#define DUMB_WINDOW_MANAGERS
-
-#define MAXCMAPS 1
-#define MINCMAPS 1
-
-typedef struct {
-  Colormap colormap;
-} xnestPrivColormap;
-
-typedef struct {
-  int numCmapIDs;
-  Colormap *cmapIDs;
-  int numWindows;
-  Window *windows;
-  int index;
-} xnestInstalledColormapWindows;
-
-#define xnestColormapPriv(pCmap) \
-  ((xnestPrivColormap *)((pCmap)->devPriv))
-
-#define xnestColormap(pCmap) (xnestColormapPriv(pCmap)->colormap)
-
-#define xnestPixel(pixel) (pixel)
-
-Bool xnestCreateColormap(ColormapPtr pCmap);
-void xnestDestroyColormap(ColormapPtr pCmap);
-void xnestSetInstalledColormapWindows(ScreenPtr pScreen);
-void xnestSetScreenSaverColormapWindow(ScreenPtr pScreen);
-void xnestDirectInstallColormaps(ScreenPtr pScreen);
-void xnestDirectUninstallColormaps(ScreenPtr pScreen);
-void xnestInstallColormap(ColormapPtr pCmap);
-void xnestUninstallColormap(ColormapPtr pCmap);
-int xnestListInstalledColormaps(ScreenPtr pScreen, Colormap *pCmapIDs);
-void xnestStoreColors(ColormapPtr pCmap, int nColors, xColorItem *pColors);
-void xnestResolveColor(unsigned short *pRed, unsigned short *pGreen,
-		       unsigned short *pBlue, VisualPtr pVisual);
-Bool xnestCreateDefaultColormap(ScreenPtr pScreen);
-
-#endif /* XNESTCOLOR_H */
+/*

+

+Copyright 1993 by Davor Matic

+

+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.  Davor Matic makes no representations about

+the suitability of this software for any purpose.  It is provided "as

+is" without express or implied warranty.

+

+*/

+

+#ifndef XNESTCOLOR_H

+#define XNESTCOLOR_H

+

+#define DUMB_WINDOW_MANAGERS

+

+#define MAXCMAPS 1

+#define MINCMAPS 1

+

+typedef struct {

+  Colormap colormap;

+} xnestPrivColormap;

+

+typedef struct {

+  int numCmapIDs;

+  Colormap *cmapIDs;

+  int numWindows;

+  Window *windows;

+  int index;

+} xnestInstalledColormapWindows;

+

+extern DevPrivateKeyRec xnestColormapPrivateKeyRec;

+#define xnestColormapPriv(pCmap) \

+  ((xnestPrivColormap *) dixLookupPrivate(&(pCmap)->devPrivates, &xnestColormapPrivateKeyRec))

+

+#define xnestColormap(pCmap) (xnestColormapPriv(pCmap)->colormap)

+

+#define xnestPixel(pixel) (pixel)

+

+Bool xnestCreateColormap(ColormapPtr pCmap);

+void xnestDestroyColormap(ColormapPtr pCmap);

+void xnestSetInstalledColormapWindows(ScreenPtr pScreen);

+void xnestSetScreenSaverColormapWindow(ScreenPtr pScreen);

+void xnestDirectInstallColormaps(ScreenPtr pScreen);

+void xnestDirectUninstallColormaps(ScreenPtr pScreen);

+void xnestInstallColormap(ColormapPtr pCmap);

+void xnestUninstallColormap(ColormapPtr pCmap);

+int xnestListInstalledColormaps(ScreenPtr pScreen, Colormap *pCmapIDs);

+void xnestStoreColors(ColormapPtr pCmap, int nColors, xColorItem *pColors);

+void xnestResolveColor(unsigned short *pRed, unsigned short *pGreen,

+		       unsigned short *pBlue, VisualPtr pVisual);

+Bool xnestCreateDefaultColormap(ScreenPtr pScreen);

+

+#endif /* XNESTCOLOR_H */

diff --git a/xorg-server/hw/xnest/GC.c b/xorg-server/hw/xnest/GC.c
index 3c0074cc9..0aaef6904 100644
--- a/xorg-server/hw/xnest/GC.c
+++ b/xorg-server/hw/xnest/GC.c
@@ -73,9 +73,6 @@ static GCOps xnestOps = {
 Bool

 xnestCreateGC(GCPtr pGC)

 {

-  pGC->clientClipType = CT_NONE;

-  pGC->clientClip = NULL;

-  

   pGC->funcs = &xnestFuncs;

   pGC->ops = &xnestOps;

   

@@ -92,8 +89,6 @@ xnestCreateGC(GCPtr pGC)
 void

 xnestValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)

 {

-  pGC->lastWinOrg.x = pDrawable->x;

-  pGC->lastWinOrg.y = pDrawable->y;

 }

 

 void

diff --git a/xorg-server/hw/xnest/Screen.c b/xorg-server/hw/xnest/Screen.c
index cf225d0ab..f4e5cbd0a 100644
--- a/xorg-server/hw/xnest/Screen.c
+++ b/xorg-server/hw/xnest/Screen.c
@@ -151,6 +151,8 @@ xnestOpenScreen(int index, ScreenPtr pScreen, int argc, char *argv[])
     return FALSE;

   if (!dixRegisterPrivateKey(&xnestPixmapPrivateKeyRec, PRIVATE_PIXMAP, sizeof (xnestPrivPixmap)))

       return FALSE;

+  if (!dixRegisterPrivateKey(&xnestColormapPrivateKeyRec, PRIVATE_COLORMAP, sizeof (xnestPrivColormap)))

+      return FALSE;

   if (!dixRegisterPrivateKey(&xnestCursorScreenKeyRec, PRIVATE_SCREEN, 0))

       return FALSE;

 

diff --git a/xorg-server/hw/xquartz/xpr/driWrap.c b/xorg-server/hw/xquartz/xpr/driWrap.c
index 37cb8cf5a..c38761555 100644
--- a/xorg-server/hw/xquartz/xpr/driWrap.c
+++ b/xorg-server/hw/xquartz/xpr/driWrap.c
@@ -41,7 +41,6 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 

 typedef struct {

     GCOps *originalOps;

-    GCOps *driOps;

 } DRIGCRec;

 

 typedef struct {

@@ -86,9 +85,7 @@ DRIUnwrapGC(GCPtr pGC) {
 

 static void 

 DRIWrapGC(GCPtr pGC) {

-    DRIGCRec *pGCPriv = DRIGetGCPriv(pGC);

-    

-    pGC->ops = pGCPriv->driOps;

+    pGC->ops = &driGCOps;

 }

 

 static void

@@ -513,7 +510,6 @@ DRICreateGC(GCPtr pGC) {
     if(ret) {

 	pGCPriv->originalOps = pGC->ops;

 	pGC->ops = &driGCOps;

-	pGCPriv->driOps = &driGCOps;

     }

 

     wrap(pScreenPriv, pScreen, CreateGC, DRICreateGC);

diff --git a/xorg-server/hw/xquartz/xpr/xprFrame.c b/xorg-server/hw/xquartz/xpr/xprFrame.c
index 5a40cbf41..121f1de3d 100644
--- a/xorg-server/hw/xquartz/xpr/xprFrame.c
+++ b/xorg-server/hw/xquartz/xpr/xprFrame.c
@@ -463,8 +463,6 @@ static RootlessFrameProcsRec xprRootlessProcs = {
     xprHideWindow,

     xprUpdateColormap,

     xp_copy_bytes,

-    xp_fill_bytes,

-    xp_composite_pixels,

     xprCopyWindow

 };

 

@@ -480,8 +478,6 @@ xprInit(ScreenPtr pScreen)
     TA_SERVER();

     

     rootless_CopyBytes_threshold = xp_copy_bytes_threshold;

-    rootless_FillBytes_threshold = xp_fill_bytes_threshold;

-    rootless_CompositePixels_threshold = xp_composite_area_threshold;

     rootless_CopyWindow_threshold = xp_scroll_area_threshold;

 

     return TRUE;

diff --git a/xorg-server/hw/xquartz/xpr/xprScreen.c b/xorg-server/hw/xquartz/xpr/xprScreen.c
index d4fef8e0a..260bfee89 100644
--- a/xorg-server/hw/xquartz/xpr/xprScreen.c
+++ b/xorg-server/hw/xquartz/xpr/xprScreen.c
@@ -367,12 +367,6 @@ xprAddScreen(int index, ScreenPtr pScreen)
 static Bool

 xprSetupScreen(int index, ScreenPtr pScreen)

 {

-    // Initialize accelerated rootless drawing

-    // Note that this must be done before DamageSetup().

-

-    // These are crashing ugly... better to be stable and not crash for now.

-    //RootlessAccelInit(pScreen);

-

 #ifdef DAMAGE

     // The Damage extension needs to wrap underneath the

     // generic rootless layer, so do it now.

diff --git a/xorg-server/hw/xwin/win.h b/xorg-server/hw/xwin/win.h
index 85104090e..5cc4dbc69 100644
--- a/xorg-server/hw/xwin/win.h
+++ b/xorg-server/hw/xwin/win.h
@@ -1377,16 +1377,6 @@ winMWExtWMCopyBytes (unsigned int width, unsigned int height,
 			   void *dst, unsigned int dstRowBytes);

 

 void

-winMWExtWMFillBytes (unsigned int width, unsigned int height, unsigned int value,

-			   void *dst, unsigned int dstRowBytes);

-

-int

-winMWExtWMCompositePixels (unsigned int width, unsigned int height, unsigned int function,

-				 void *src[2], unsigned int srcRowBytes[2],

-				 void *mask, unsigned int maskRowBytes,

-				 void *dst[2], unsigned int dstRowBytes[2]);

-

-void

 winMWExtWMCopyWindow (RootlessFrameID wid, int dstNrects, const BoxRec *dstRects,

 			    int dx, int dy);

 #endif

diff --git a/xorg-server/hw/xwin/wingc.c b/xorg-server/hw/xwin/wingc.c
index 7f26ea1d4..a131264b9 100644
--- a/xorg-server/hw/xwin/wingc.c
+++ b/xorg-server/hw/xwin/wingc.c
@@ -137,11 +137,6 @@ winCreateGCNativeGDI (GCPtr pGC)
 	  pGC->depth);

 #endif

 

-  pGC->clientClip = NULL;

-  pGC->clientClipType = CT_NONE;

-  pGC->freeCompClip = FALSE;

-  pGC->pCompositeClip = 0;

-

   pGC->ops = (GCOps *) &winGCOps;

   pGC->funcs = (GCFuncs *) &winGCFuncs;

 

diff --git a/xorg-server/hw/xwin/winscrinit.c b/xorg-server/hw/xwin/winscrinit.c
index 179eff8d0..03d7c6014 100644
--- a/xorg-server/hw/xwin/winscrinit.c
+++ b/xorg-server/hw/xwin/winscrinit.c
@@ -54,17 +54,13 @@ winMWExtWMProcs = {
   winMWExtWMStartDrawing,

   winMWExtWMStopDrawing,

   winMWExtWMUpdateRegion,

-#ifndef ROOTLESS_TRACK_DAMAGE

   winMWExtWMDamageRects,

-#endif

   winMWExtWMRootlessSwitchWindow,

   NULL,//winMWExtWMDoReorderWindow,

   NULL,//winMWExtWMHideWindow,

   NULL,//winMWExtWMUpdateColorMap,

 

   NULL,//winMWExtWMCopyBytes,

-  NULL,//winMWExtWMFillBytes,

-  NULL,//winMWExtWMCompositePixels,

   winMWExtWMCopyWindow

 };

 #endif

@@ -465,8 +461,6 @@ winFinishScreenInitFB (int index,
       winDebug ("winScreenInit - MultiWindowExtWM - RootlessInit returned\n");

       

       rootless_CopyBytes_threshold = 0;

-      rootless_FillBytes_threshold = 0;

-      rootless_CompositePixels_threshold = 0;

       /* FIXME: How many? Profiling needed? */

       rootless_CopyWindow_threshold = 1;

 

diff --git a/xorg-server/hw/xwin/winwin32rootless.c b/xorg-server/hw/xwin/winwin32rootless.c
index 5bad44638..92c7ca500 100644
--- a/xorg-server/hw/xwin/winwin32rootless.c
+++ b/xorg-server/hw/xwin/winwin32rootless.c
@@ -1007,28 +1007,6 @@ winMWExtWMCopyBytes (unsigned int width, unsigned int height,
 }

 

 void

-winMWExtWMFillBytes (unsigned int width, unsigned int height, unsigned int value,

-			   void *dst, unsigned int dstRowBytes)

-{

-#if CYGMULTIWINDOW_DEBUG

-  winDebug ("winMWExtWMFillBytes - Not implemented\n");

-#endif

-}

-

-int

-winMWExtWMCompositePixels (unsigned int width, unsigned int height, unsigned int function,

-				 void *src[2], unsigned int srcRowBytes[2],

-				 void *mask, unsigned int maskRowBytes,

-				 void *dst[2], unsigned int dstRowBytes[2])

-{

-#if CYGMULTIWINDOW_DEBUG

-  winDebug ("winMWExtWMCompositePixels - Not implemented\n");

-#endif

-  return 0;

-}

-

-

-void

 winMWExtWMCopyWindow (RootlessFrameID wid, int nDstRects, const BoxRec *pDstRects,

 			    int nDx, int nDy)

 {

diff --git a/xorg-server/include/closestr.h b/xorg-server/include/closestr.h
index a64798608..d29ee4d91 100644
--- a/xorg-server/include/closestr.h
+++ b/xorg-server/include/closestr.h
@@ -97,16 +97,6 @@ typedef struct _LFclosure {
 

 /* PolyText */

 

-typedef

-    int			(* PolyTextPtr)(

-			DrawablePtr /* pDraw */,

-			GCPtr /* pGC */,

-			int /* x */,

-			int /* y */,

-			int /* count */,

-			void * /* chars or shorts */

-			);

-

 typedef struct _PTclosure {

     ClientPtr		client;

     DrawablePtr		pDraw;

@@ -117,24 +107,12 @@ typedef struct _PTclosure {
     int			xorg;

     int			yorg;

     CARD8		reqType;

-    PolyTextPtr		polyText;

-    int			itemSize;

     XID			did;

     int			err;

 } PTclosureRec;

 

 /* ImageText */

 

-typedef

-    void		(* ImageTextPtr)(

-			DrawablePtr /* pDraw */,

-			GCPtr /* pGC */,

-			int /* x */,

-			int /* y */,

-			int /* count */,

-			void * /* chars or shorts */

-			);

-

 typedef struct _ITclosure {

     ClientPtr		client;

     DrawablePtr		pDraw;

@@ -144,8 +122,6 @@ typedef struct _ITclosure {
     int			xorg;

     int			yorg;

     CARD8		reqType;

-    ImageTextPtr	imageText;

-    int			itemSize;

     XID			did;

 } ITclosureRec;

 #endif				/* CLOSESTR_H */

diff --git a/xorg-server/include/colormapst.h b/xorg-server/include/colormapst.h
index f1fc8ebef..385c7969c 100644
--- a/xorg-server/include/colormapst.h
+++ b/xorg-server/include/colormapst.h
@@ -1,134 +1,132 @@
-/*
-
-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.
-
-*/
-
-#ifndef CMAPSTRUCT_H
-#define CMAPSTRUCT_H 1
-
-#include <X11/Xarch.h>
-
-#include "colormap.h"
-#include "screenint.h"
-#include "privates.h"
-
-/* Shared color -- the color is used by AllocColorPlanes */
-typedef struct
-{
-    unsigned short color;
-    short  refcnt;
-} SHAREDCOLOR;
-
-/* LOCO -- a local color for a PseudoColor cell. DirectColor maps always
- * use the first value (called red) in the structure.  What channel they
- * are really talking about depends on which map they are in. */
-typedef struct
-{
-    unsigned short	red, green, blue;
-} LOCO;
-
-/* SHCO -- a shared color for a PseudoColor cell. Used with AllocColorPlanes.
- * DirectColor maps always use the first value (called red) in the structure.
- * What channel they are really talking about depends on which map they
- * are in. */
-typedef struct 
-{
-    SHAREDCOLOR *red, *green, *blue;
-} SHCO;
-
-
-/* color map entry */
-typedef struct _CMEntry
-{
-    union
-    {
-	LOCO	local;
-	SHCO	shco;
-    } co;
-    short	refcnt;
-    Bool	fShared;
-} Entry;
-
-/*
- * COLORMAPs can be used for either Direct or Pseudo color.  PseudoColor
- * only needs one cell table, we arbitrarily pick red.  We keep track
- * of that table with freeRed, numPixelsRed, and clientPixelsRed
- *
- * The padN variables are unfortunate ABI BC. See fdo bug #6924.
- */
-
-typedef struct _ColormapRec
-{
-    VisualPtr	pVisual;
-    short	class;		/* PseudoColor or DirectColor */
-#if defined(_XSERVER64)
-    short	pad0;
-    XID		pad1;
-#endif
-    XID		mid;		/* client's name for colormap */
-#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)
-    XID		pad2;
-#endif
-    ScreenPtr	pScreen;	/* screen map is associated with */
-    short	flags;		/* 1 = IsDefault
-				 * 2 = AllAllocated */
-    int		freeRed;
-    int		freeGreen;
-    int		freeBlue;
-    int		*numPixelsRed;	
-    int		*numPixelsGreen;	
-    int		*numPixelsBlue;	
-    Pixel	**clientPixelsRed;
-    Pixel	**clientPixelsGreen;
-    Pixel	**clientPixelsBlue;
-    Entry	*red;
-    Entry 	*green;
-    Entry	*blue;
-    pointer	devPriv;
-    PrivateRec	*devPrivates;	/* dynamic devPrivates added after devPriv
-				   already existed - must keep devPriv */
-} ColormapRec;
-	      
-#endif /* COLORMAP_H */
+/*

+

+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.

+

+*/

+

+#ifndef CMAPSTRUCT_H

+#define CMAPSTRUCT_H 1

+

+#include <X11/Xarch.h>

+

+#include "colormap.h"

+#include "screenint.h"

+#include "privates.h"

+

+/* Shared color -- the color is used by AllocColorPlanes */

+typedef struct

+{

+    unsigned short color;

+    short  refcnt;

+} SHAREDCOLOR;

+

+/* LOCO -- a local color for a PseudoColor cell. DirectColor maps always

+ * use the first value (called red) in the structure.  What channel they

+ * are really talking about depends on which map they are in. */

+typedef struct

+{

+    unsigned short	red, green, blue;

+} LOCO;

+

+/* SHCO -- a shared color for a PseudoColor cell. Used with AllocColorPlanes.

+ * DirectColor maps always use the first value (called red) in the structure.

+ * What channel they are really talking about depends on which map they

+ * are in. */

+typedef struct 

+{

+    SHAREDCOLOR *red, *green, *blue;

+} SHCO;

+

+

+/* color map entry */

+typedef struct _CMEntry

+{

+    union

+    {

+	LOCO	local;

+	SHCO	shco;

+    } co;

+    short	refcnt;

+    Bool	fShared;

+} Entry;

+

+/*

+ * COLORMAPs can be used for either Direct or Pseudo color.  PseudoColor

+ * only needs one cell table, we arbitrarily pick red.  We keep track

+ * of that table with freeRed, numPixelsRed, and clientPixelsRed

+ *

+ * The padN variables are unfortunate ABI BC. See fdo bug #6924.

+ */

+

+typedef struct _ColormapRec

+{

+    VisualPtr	pVisual;

+    short	class;		/* PseudoColor or DirectColor */

+#if defined(_XSERVER64)

+    short	pad0;

+    XID		pad1;

+#endif

+    XID		mid;		/* client's name for colormap */

+#if defined(_XSERVER64) && (X_BYTE_ORDER == X_LITTLE_ENDIAN)

+    XID		pad2;

+#endif

+    ScreenPtr	pScreen;	/* screen map is associated with */

+    short	flags;		/* 1 = IsDefault

+				 * 2 = AllAllocated */

+    int		freeRed;

+    int		freeGreen;

+    int		freeBlue;

+    int		*numPixelsRed;	

+    int		*numPixelsGreen;	

+    int		*numPixelsBlue;	

+    Pixel	**clientPixelsRed;

+    Pixel	**clientPixelsGreen;

+    Pixel	**clientPixelsBlue;

+    Entry	*red;

+    Entry 	*green;

+    Entry	*blue;

+    PrivateRec	*devPrivates;

+} ColormapRec;

+	      

+#endif /* COLORMAP_H */

diff --git a/xorg-server/include/gc.h b/xorg-server/include/gc.h
index 428c40441..89a74d8ba 100644
--- a/xorg-server/include/gc.h
+++ b/xorg-server/include/gc.h
@@ -122,10 +122,6 @@ extern _X_EXPORT int FreeGC(
     pointer /*pGC*/,

     XID /*gid*/);

 

-extern _X_EXPORT GCPtr CreateScratchGC(

-    ScreenPtr /*pScreen*/,

-    unsigned /*depth*/);

-

 extern _X_EXPORT void FreeGCperDepth(

     int /*screenNum*/);

 

diff --git a/xorg-server/include/gcstruct.h b/xorg-server/include/gcstruct.h
index c2f057a4a..5a34f0b70 100644
--- a/xorg-server/include/gcstruct.h
+++ b/xorg-server/include/gcstruct.h
@@ -95,7 +95,6 @@ typedef struct _GCFuncs {
     void	(* CopyClip)(

 		GCPtr /*pgcDst*/,

 		GCPtr /*pgcSrc*/);

-    DevUnion	devPrivate;

 } GCFuncs;

 

 /*

@@ -264,8 +263,6 @@ typedef struct _GCOps {
 		int /*h*/,

 		int /*x*/,

 		int /*y*/);

-

-    DevUnion	devPrivate;

 } GCOps;

 

 /* there is padding in the bit fields because the Sun compiler doesn't

@@ -306,7 +303,6 @@ typedef struct _GC {
     DDXPointRec		patOrg;		/* origin for (tile, stipple) */

     struct _Font	*font;

     DDXPointRec		clipOrg;

-    DDXPointRec		lastWinOrg;	/* position of window last validated */

     pointer		clientClip;

     unsigned long	stateChanges;	/* masked with GC_<kind> */

     unsigned long       serialNumber;

diff --git a/xorg-server/mi/miglblt.c b/xorg-server/mi/miglblt.c
index c299fe554..b93ef5efa 100644
--- a/xorg-server/mi/miglblt.c
+++ b/xorg-server/mi/miglblt.c
@@ -182,8 +182,6 @@ miPolyGlyphBlt(
 				0, 0, gWidth, gHeight, 

 				0, XYBitmap, (char *)pb);

 

-	    if ((pGC->serialNumber) != (pDrawable->serialNumber))

-		ValidateGC(pDrawable, pGC);

 	    (*pGC->ops->PushPixels)(pGC, pPixmap, pDrawable,

 			       gWidth, gHeight,

 			       x + pci->metrics.leftSideBearing,

diff --git a/xorg-server/miext/cw/cw.c b/xorg-server/miext/cw/cw.c
index e4b264771..db06209d9 100644
--- a/xorg-server/miext/cw/cw.c
+++ b/xorg-server/miext/cw/cw.c
@@ -325,7 +325,6 @@ cwCreateGC(GCPtr pGC)
     ScreenPtr	pScreen = pGC->pScreen;

     Bool	ret;

 

-    memset(pPriv, 0, sizeof(cwGCRec));

     SCREEN_PROLOGUE(pScreen, CreateGC);

 

     if ( (ret = (*pScreen->CreateGC)(pGC)) )

diff --git a/xorg-server/miext/damage/damage.c b/xorg-server/miext/damage/damage.c
index f14a363bb..263ca8afa 100644
--- a/xorg-server/miext/damage/damage.c
+++ b/xorg-server/miext/damage/damage.c
@@ -446,7 +446,6 @@ damageCreateGC(GCPtr pGC)
     damageGCPriv(pGC);

     Bool ret;

 

-    pGC->pCompositeClip = 0;

     unwrap (pScrPriv, pScreen, CreateGC);

     if((ret = (*pScreen->CreateGC) (pGC))) {

 	pGCPriv->ops = NULL;

@@ -458,28 +457,6 @@ damageCreateGC(GCPtr pGC)
     return ret;

 }

 

-#ifdef NOTUSED

-static void

-damageWrapGC (GCPtr pGC)

-{

-    damageGCPriv(pGC);

-

-    pGCPriv->ops = NULL;

-    pGCPriv->funcs = pGC->funcs;

-    pGC->funcs = &damageGCFuncs;

-}

-

-static void

-damageUnwrapGC (GCPtr pGC)

-{

-    damageGCPriv(pGC);

-

-    pGC->funcs = pGCPriv->funcs;

-    if (pGCPriv->ops)

-	pGC->ops = pGCPriv->ops;

-}

-#endif

-

 #define DAMAGE_GC_OP_PROLOGUE(pGC, pDrawable) \

     damageGCPriv(pGC);  \

     GCFuncs *oldFuncs = pGC->funcs; \

@@ -1779,7 +1756,6 @@ static GCOps damageGCOps = {
     damagePolyText16, damageImageText8,

     damageImageText16, damageImageGlyphBlt,

     damagePolyGlyphBlt, damagePushPixels,

-    {NULL}		/* devPrivate */

 };

 

 static void

diff --git a/xorg-server/miext/rootless/README.txt b/xorg-server/miext/rootless/README.txt
index 2c3fbb05a..1beabda38 100644
--- a/xorg-server/miext/rootless/README.txt
+++ b/xorg-server/miext/rootless/README.txt
@@ -1,399 +1,334 @@
-                            Generic Rootless Layer
-                                 Version 1.0
-                                July 13, 2004
-
-                               Torrey T. Lyons
-                              torrey@xfree86.org
-
-
-Introduction
-
-        The generic rootless layer allows an X server to be implemented 
-on top of another window server in a cooperative manner. This allows the 
-X11 windows and native windows of the underlying window server to 
-coexist on the same screen. The layer is called "rootless" because the root 
-window of the X server is generally not drawn. Instead, each top-level 
-child of the root window is represented as a separate on-screen window by 
-the underlying window server. The layer is referred to as "generic" 
-because it abstracts away the details of the underlying window system and 
-contains code that is useful for any rootless X server. The code for the 
-generic rootless layer is located in xc/programs/Xserver/miext/rootless. To 
-build a complete rootless X server requires a specific rootless 
-implementation, which provides functions that allow the generic rootless 
-layer to interact with the underlying window system.
-
-
-Concepts
-
-        In the context of a rootless X server the term window is used to 
-mean many fundamentally different things. For X11 a window is a DDX 
-resource that describes a visible, or potentially visible, rectangle on the 
-screen. A top-level window is a direct child of the root window. To avoid 
-confusion, an on-screen native window of the underlying window system 
-is referred to as a "frame". The generic rootless layer associates each 
-mapped top-level X11 window with a frame. An X11 window may be said 
-to be "framed" if it or its top-level parent is represented by a frame.
-
-        The generic rootless layer models each frame as being backed at 
-all times by a backing buffer, which is periodically flushed to the screen. 
-If the underlying window system does not provide a backing buffer for 
-frames, this must be done by the rootless implementation. The generic 
-rootless layer model does not assume it always has access to the frames' 
-backing buffers. Any drawing to the buffer will be proceeded by a call to 
-the rootless implementation's StartDrawing() function and StopDrawing() 
-will be called when the drawing is concluded. The address of the frame's 
-backing buffer is returned by the StartDrawing() function and it can 
-change between successive calls.
-
-        Because each frame is assumed to have a backing buffer, the 
-generic rootless layer will stop Expose events being generated when the 
-regions of visibility of a frame change on screen. This is similar to backing 
-store, but backing buffers are different in that they always store a copy of 
-the entire window contents, not just the obscured portions. The price paid 
-in increased memory consumption is made up by the greatly decreased 
-complexity in not having to track and record regions as they are obscured.
-
-
-Rootless Implementation
-
-        The specifics of the underlying window system are provided to the 
-generic rootless layer through rootless implementation functions, compile-
-time options, and runtime parameters. The rootless implementation 
-functions are a list of functions that allow the generic rootless layer to 
-perform operations such as creating, destroying, moving, and resizing 
-frames. Some of the implementation functions are optional. A detailed 
-description of the rootless implementation functions is provided in 
-Appendix A.
-
-        By design, a rootless implementation should only have to include 
-the rootless.h header file. The rootlessCommon.h file contains definitions 
-internal to the generic rootless layer. (If you find you need to use 
-rootlessCommon.h in your implementation, let the generic rootless layer 
-maintainers know. This could be an area where the generic rootless layer 
-should be generalized.) A rootless implementation should also modify 
-rootlessConfig.h to specify compile time options for its platform.
-
-        The following compile-time options are defined in 
-rootlessConfig.h:
-
-      o ROOTLESS_GLOBAL_COORDS: This option controls the way that frame
-        coordinates are passed to the rootless implementation. If false,
-        the coordinates are passed per screen relative to the origin of 
-        the screen the frame is currently on. Some implementations may 
-        prefer to work in a single global coordinate space that spans all 
-        screens. If this option is true, the coordinates are passed after 
-        adding the coordinates of the screen origin and an overall offset of 
-        (rootlessGlobalOffsetX, rootlessGlobalOffsetY).
-
-      o ROOTLESS_PROTECT_ALPHA: By default for a color bit depth of 24 and
-        32 bits per pixel, fb will overwrite the "unused" 8 bits to optimize
-        drawing speed. If this is true, the alpha channel of frames is
-        protected and is not modified when drawing to them. The bits 
-        containing the alpha channel are defined by the macro 
-        RootlessAlphaMask(bpp), which should return a bit mask for 
-        various bits per pixel.
-
-      o ROOTLESS_REDISPLAY_DELAY: Time in milliseconds between updates to
-        the underlying window server. Most operations will be buffered until
-        this time has expired.
-
-      o ROOTLESS_RESIZE_GRAVITY: If the underlying window system supports it,
-        some frame resizes can be optimized by relying on the frame contents
-        maintaining a particular gravity during the resize. In this way less
-        of the frame contents need to be preserved by the generic rootless
-        layer. If true, the generic rootless layer will pass gravity hints
-        during resizing and rely on the frame contents being preserved
-        accordingly.
-
-      o ROOTLESS_TRACK_DAMAGE: The generic rootless layer draws to the
-        frames' backing buffers and periodically flushes the modified
-        regions to the underlying window server. If this option is true,
-        the generic rootless layer will track these damaged regions. 
-        Currently it uses the miRegion code and will not simplify damaged 
-        regions even when updating a bounding region would be more 
-        efficient. Some window systems provide a more efficient way to 
-        track damaged regions. If this option is false, the rootless 
-        implementation function DamageRects() is called whenever a 
-        backing buffer is modified and the rootless implementation is 
-        expected to track the damaged regions itself.
-
-        The following runtime options are defined in rootless.h:
-
-      o rootlessGlobalOffsetX, rootlessGlobalOffsetY: These are only 
-        used if ROOTLESS_GLOBAL_COORDS is true. They specify the global
-        offset that is applied to all screens when converting from
-        screen-local to global coordinates.
-
-      o rootless_CopyBytes_threshold, rootless_FillBytes_threshold, 
-        rootless_CompositePixels_threshold, rootless_CopyWindow_threshold:
-        The minimum number of bytes or pixels for which to use the rootless
-        implementation's respective acceleration function. The rootless
-        acceleration functions are all optional so these will only be used
-        if the respective acceleration function pointer is not NULL.
-
-
-Accelerated Drawing
-
-	The rootless implementation typically does not have direct access 
-to the hardware. Its access to the graphics hardware is generally through 
-the API of the underlying window system. This underlying API may not 
-overlap well with the X11 drawing primitives. The generic rootless layer 
-falls back to using fb for all its 2-D drawing. Providing optional rootless 
-implementation acceleration functions can accelerate some graphics 
-primitives and some window functions. Typically calling through to the 
-underlying window systems API will not speed up these operations for 
-small enough areas. The rootless_*_threshold runtime options allow the 
-rootless implementation to provide hints for when the acceleration 
-functions should be used instead of fb.
-
-
-Alpha Channel Protection
-
-	If the bits per pixel is greater then the color bit depth, the contents 
-of the extra bits are undefined by the X11 protocol. Some window systems 
-will use these extra bits as an alpha channel. The generic rootless layer can 
-be configured to protect these bits and make sure they are not modified by 
-other parts of the X server. To protect the alpha channel 
-ROOTLESS_PROTECT_ALPHA and RootlessAlphaMask(bpp) must be 
-set appropriately as described under the compile time options. This 
-ensures that the X11 graphics primitives do not overwrite the alpha 
-channel in an attempt to optimize drawing. In addition, the window 
-functions PaintWindow() and Composite() must be replaced by alpha 
-channel safe variants. These are provided in rootless/safeAlpha.
-
-
-Credits
-
-	The generic rootless layer was originally conceived and developed 
-by Greg Parker as part of the XDarwin X server on Mac OS X. John 
-Harper made later optimizations to this code but removed its generic 
-independence of the underlying window system. Torrey T. Lyons 
-reintroduced the generic abstractions and made the rootless code suitable 
-for use by other X servers.
-
-
-Appendix A: Rootless Implementation Functions
-
-	The rootless implementation functions are defined in rootless.h. It 
-is intended that rootless.h contains the complete interface that is needed by 
-rootless implementations. The definitions contained in rootlessCommon.h 
-are intended for internal use by the generic rootless layer and are more 
-likely to change.
-
-	Most of these functions take a RootlessFrameID as a parameter. 
-The RootlessFrameID is an opaque object that is returned by the 
-implementation's CreateFrame() function. The generic rootless layer does 
-not use this frame id other than to pass it back to the rootless 
-implementation to indicate the frame to operate on.
-
-/*
- * Create a new frame.
- *  The frame is created unmapped.
- *
- *  pFrame      RootlessWindowPtr for this frame should be completely
- *              initialized before calling except for pFrame->wid, which
- *              is set by this function.
- *  pScreen     Screen on which to place the new frame
- *  newX, newY  Position of the frame. These will be identical to pFrame-x,
- *              pFrame->y unless ROOTLESS_GLOBAL_COORDS is set.
- *  pNewShape   Shape for the frame (in frame-local coordinates). NULL for
- *              unshaped frames.
- */
-typedef Bool (*RootlessCreateFrameProc)
-    (RootlessWindowPtr pFrame, ScreenPtr pScreen, int newX, int newY,
-     RegionPtr pNewShape);
-
-/*
- * Destroy a frame.
- *  Drawing is stopped and all updates are flushed before this is called.
- *
- *  wid         Frame id
- */
-typedef void (*RootlessDestroyFrameProc)
-    (RootlessFrameID wid);
-
-/*
- * Move a frame on screen.
- *  Drawing is stopped and all updates are flushed before this is called.
- *
- *  wid         Frame id
- *  pScreen     Screen to move the new frame to
- *  newX, newY  New position of the frame
- */
-typedef void (*RootlessMoveFrameProc) 
-    (RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY);
-
-/*
- * Resize and move a frame.
- *  Drawing is stopped and all updates are flushed before this is called.
- *
- *  wid         Frame id
- *  pScreen     Screen to move the new frame to
- *  newX, newY  New position of the frame
- *  newW, newH  New size of the frame
- *  gravity     Gravity for window contents (rl_gravity_enum). This is always
- *              RL_GRAVITY_NONE unless ROOTLESS_RESIZE_GRAVITY is set.
- */
-typedef void (*RootlessResizeFrameProc)
-    (RootlessFrameID wid, ScreenPtr pScreen,
-     int newX, int newY, unsigned int newW, unsigned int newH,
-     unsigned int gravity);
-
-/*
- * Change frame ordering (AKA stacking, layering).
- *  Drawing is stopped before this is called. Unmapped frames are mapped by
- *  setting their ordering.
- *
- *  wid         Frame id
- *  nextWid     Frame id of frame that is now above this one or NULL if this
- *              frame is at the top.
- */
-typedef void (*RootlessRestackFrameProc)
-    (RootlessFrameID wid, RootlessFrameID nextWid);
-
-/*
- * Change frame's shape.
- *  Drawing is stopped before this is called.
- *
- *  wid         Frame id
- *  pNewShape   New shape for the frame (in frame-local coordinates)
- *              or NULL if now unshaped.
- */
-typedef void (*RootlessReshapeFrameProc)
-    (RootlessFrameID wid, RegionPtr pNewShape);
-
-/*
- * Unmap a frame.
- *
- *  wid         Frame id
- */
-typedef void (*RootlessUnmapFrameProc)
-    (RootlessFrameID wid);
-
-/*
- * Start drawing to a frame.
- *  Prepare a frame for direct access to its backing buffer.
- *
- *  wid         Frame id
- *  pixelData   Address of the backing buffer (returned)
- *  bytesPerRow Width in bytes of the backing buffer (returned)
- */
-typedef void (*RootlessStartDrawingProc)
-    (RootlessFrameID wid, char **pixelData, int *bytesPerRow);
-
-/*
- * Stop drawing to a frame.
- *  No drawing to the frame's backing buffer will occur until drawing
- *  is started again.
- *
- *  wid         Frame id
- *  flush       Flush drawing updates for this frame to the screen. This
- *              will always be FALSE if ROOTLESS_TRACK_DAMAGE is set.
- */
-typedef void (*RootlessStopDrawingProc)
-    (RootlessFrameID wid, Bool flush);
-
-/*
- * Flush drawing updates to the screen.
- *  Drawing is stopped before this is called.
- *
- *  wid         Frame id
- *  pDamage     Region containing all the changed pixels in frame-local
- *              coordinates. This is clipped to the window's clip. This
- *              will be NULL if ROOTLESS_TRACK_DAMAGE is not set.
- */
-typedef void (*RootlessUpdateRegionProc)
-    (RootlessFrameID wid, RegionPtr pDamage);
-
-/*
- * Mark damaged rectangles as requiring redisplay to screen.
- *  This will only be called if ROOTLESS_TRACK_DAMAGE is not set.
- *
- *  wid         Frame id
- *  nrects      Number of damaged rectangles
- *  rects       Array of damaged rectangles in frame-local coordinates
- *  shift_x,    Vector to shift rectangles by
- *   shift_y
- */
-typedef void (*RootlessDamageRectsProc)
-    (RootlessFrameID wid, int nrects, const BoxRec *rects,
-     int shift_x, int shift_y);
-
-/*
- * Switch the window associated with a frame. (Optional)
- *  When a framed window is reparented, the frame is resized and set to
- *  use the new top-level parent. If defined this function will be called
- *  afterwards for implementation specific bookkeeping.
- *
- *  pFrame      Frame whose window has switched
- *  oldWin      Previous window wrapped by this frame
- */
-typedef void (*RootlessSwitchWindowProc)
-    (RootlessWindowPtr pFrame, WindowPtr oldWin);
-
-/*
- * Copy bytes. (Optional)
- *  Source and destinate may overlap and the right thing should happen.
- *
- *  width       Bytes to copy per row
- *  height      Number of rows
- *  src         Source data
- *  srcRowBytes Width of source in bytes
- *  dst         Destination data
- *  dstRowBytes Width of destination in bytes
- */
-typedef void (*RootlessCopyBytesProc)
-    (unsigned int width, unsigned int height,
-     const void *src, unsigned int srcRowBytes,
-     void *dst, unsigned int dstRowBytes);
-
-/*
- * Fill memory with 32-bit pattern. (Optional)
- *
- *  width       Bytes to fill per row
- *  height      Number of rows
- *  value       32-bit pattern to fill with
- *  dst         Destination data
- *  dstRowBytes Width of destination in bytes
- */
-typedef void (*RootlessFillBytesProc)
-    (unsigned int width, unsigned int height, unsigned int value,
-     void *dst, unsigned int dstRowBytes);
-
-/*
- * Composite pixels from source and mask to destination. (Optional)
- *
- *  width, height   Size of area to composite to in pizels
- *  function        Composite function built with RL_COMPOSITE_FUNCTION
- *  src             Source data
- *  srcRowBytes     Width of source in bytes (Passing NULL means source
- *                  is a single pixel.
- *  mask            Mask data
- *  maskRowBytes    Width of mask in bytes
- *  dst             Destination data
- *  dstRowBytes     Width of destination in bytes
- *
- *  For src and dst, the first element of the array is the color data. If
- *  the second element is non-null it implies there is alpha data (which
- *  may be meshed or planar). Data without alpha is assumed to be opaque.
- *
- *  An X11 error code is returned.
- */
-typedef int (*RootlessCompositePixelsProc)
-    (unsigned int width, unsigned int height, unsigned int function,
-     void *src[2], unsigned int srcRowBytes[2],
-     void *mask, unsigned int maskRowBytes,
-     void *dst[2], unsigned int dstRowBytes[2]);
-
-/*
- * Copy area in frame to another part of frame. (Optional)
- *
- *  wid         Frame id
- *  dstNrects   Number of rectangles to copy
- *  dstRects    Array of rectangles to copy
- *  dx, dy      Number of pixels away to copy area
- */
-typedef void (*RootlessCopyWindowProc)
-    (RootlessFrameID wid, int dstNrects, const BoxRec *dstRects,
-     int dx, int dy);
-
+                            Generic Rootless Layer

+                                 Version 1.0

+                                July 13, 2004

+

+                               Torrey T. Lyons

+                              torrey@xfree86.org

+

+

+Introduction

+

+        The generic rootless layer allows an X server to be implemented 

+on top of another window server in a cooperative manner. This allows the 

+X11 windows and native windows of the underlying window server to 

+coexist on the same screen. The layer is called "rootless" because the root 

+window of the X server is generally not drawn. Instead, each top-level 

+child of the root window is represented as a separate on-screen window by 

+the underlying window server. The layer is referred to as "generic" 

+because it abstracts away the details of the underlying window system and 

+contains code that is useful for any rootless X server. The code for the 

+generic rootless layer is located in xc/programs/Xserver/miext/rootless. To 

+build a complete rootless X server requires a specific rootless 

+implementation, which provides functions that allow the generic rootless 

+layer to interact with the underlying window system.

+

+

+Concepts

+

+        In the context of a rootless X server the term window is used to 

+mean many fundamentally different things. For X11 a window is a DDX 

+resource that describes a visible, or potentially visible, rectangle on the 

+screen. A top-level window is a direct child of the root window. To avoid 

+confusion, an on-screen native window of the underlying window system 

+is referred to as a "frame". The generic rootless layer associates each 

+mapped top-level X11 window with a frame. An X11 window may be said 

+to be "framed" if it or its top-level parent is represented by a frame.

+

+        The generic rootless layer models each frame as being backed at 

+all times by a backing buffer, which is periodically flushed to the screen. 

+If the underlying window system does not provide a backing buffer for 

+frames, this must be done by the rootless implementation. The generic 

+rootless layer model does not assume it always has access to the frames' 

+backing buffers. Any drawing to the buffer will be proceeded by a call to 

+the rootless implementation's StartDrawing() function and StopDrawing() 

+will be called when the drawing is concluded. The address of the frame's 

+backing buffer is returned by the StartDrawing() function and it can 

+change between successive calls.

+

+        Because each frame is assumed to have a backing buffer, the 

+generic rootless layer will stop Expose events being generated when the 

+regions of visibility of a frame change on screen. This is similar to backing 

+store, but backing buffers are different in that they always store a copy of 

+the entire window contents, not just the obscured portions. The price paid 

+in increased memory consumption is made up by the greatly decreased 

+complexity in not having to track and record regions as they are obscured.

+

+

+Rootless Implementation

+

+        The specifics of the underlying window system are provided to the 

+generic rootless layer through rootless implementation functions, compile-

+time options, and runtime parameters. The rootless implementation 

+functions are a list of functions that allow the generic rootless layer to 

+perform operations such as creating, destroying, moving, and resizing 

+frames. Some of the implementation functions are optional. A detailed 

+description of the rootless implementation functions is provided in 

+Appendix A.

+

+        By design, a rootless implementation should only have to include 

+the rootless.h header file. The rootlessCommon.h file contains definitions 

+internal to the generic rootless layer. (If you find you need to use 

+rootlessCommon.h in your implementation, let the generic rootless layer 

+maintainers know. This could be an area where the generic rootless layer 

+should be generalized.) A rootless implementation should also modify 

+rootlessConfig.h to specify compile time options for its platform.

+

+        The following compile-time options are defined in 

+rootlessConfig.h:

+

+      o ROOTLESS_PROTECT_ALPHA: By default for a color bit depth of 24 and

+        32 bits per pixel, fb will overwrite the "unused" 8 bits to optimize

+        drawing speed. If this is true, the alpha channel of frames is

+        protected and is not modified when drawing to them. The bits 

+        containing the alpha channel are defined by the macro 

+        RootlessAlphaMask(bpp), which should return a bit mask for 

+        various bits per pixel.

+

+      o ROOTLESS_REDISPLAY_DELAY: Time in milliseconds between updates to

+        the underlying window server. Most operations will be buffered until

+        this time has expired.

+

+      o ROOTLESS_RESIZE_GRAVITY: If the underlying window system supports it,

+        some frame resizes can be optimized by relying on the frame contents

+        maintaining a particular gravity during the resize. In this way less

+        of the frame contents need to be preserved by the generic rootless

+        layer. If true, the generic rootless layer will pass gravity hints

+        during resizing and rely on the frame contents being preserved

+        accordingly.

+

+        The following runtime options are defined in rootless.h:

+

+      o rootlessGlobalOffsetX, rootlessGlobalOffsetY: These specify the global

+        offset that is applied to all screens when converting from

+        screen-local to global coordinates.

+

+      o rootless_CopyBytes_threshold, rootless_CopyWindow_threshold:

+        The minimum number of bytes or pixels for which to use the rootless

+        implementation's respective acceleration function. The rootless

+        acceleration functions are all optional so these will only be used

+        if the respective acceleration function pointer is not NULL.

+

+

+Accelerated Drawing

+

+	The rootless implementation typically does not have direct access 

+to the hardware. Its access to the graphics hardware is generally through 

+the API of the underlying window system. This underlying API may not 

+overlap well with the X11 drawing primitives. The generic rootless layer 

+falls back to using fb for all its 2-D drawing. Providing optional rootless 

+implementation acceleration functions can accelerate some graphics 

+primitives and some window functions. Typically calling through to the 

+underlying window systems API will not speed up these operations for 

+small enough areas. The rootless_*_threshold runtime options allow the 

+rootless implementation to provide hints for when the acceleration 

+functions should be used instead of fb.

+

+

+Alpha Channel Protection

+

+	If the bits per pixel is greater then the color bit depth, the contents 

+of the extra bits are undefined by the X11 protocol. Some window systems 

+will use these extra bits as an alpha channel. The generic rootless layer can 

+be configured to protect these bits and make sure they are not modified by 

+other parts of the X server. To protect the alpha channel 

+ROOTLESS_PROTECT_ALPHA and RootlessAlphaMask(bpp) must be 

+set appropriately as described under the compile time options. This 

+ensures that the X11 graphics primitives do not overwrite the alpha 

+channel in an attempt to optimize drawing. In addition, the window 

+functions PaintWindow() and Composite() must be replaced by alpha 

+channel safe variants. These are provided in rootless/safeAlpha.

+

+

+Credits

+

+	The generic rootless layer was originally conceived and developed 

+by Greg Parker as part of the XDarwin X server on Mac OS X. John 

+Harper made later optimizations to this code but removed its generic 

+independence of the underlying window system. Torrey T. Lyons 

+reintroduced the generic abstractions and made the rootless code suitable 

+for use by other X servers.

+

+

+Appendix A: Rootless Implementation Functions

+

+	The rootless implementation functions are defined in rootless.h. It 

+is intended that rootless.h contains the complete interface that is needed by 

+rootless implementations. The definitions contained in rootlessCommon.h 

+are intended for internal use by the generic rootless layer and are more 

+likely to change.

+

+	Most of these functions take a RootlessFrameID as a parameter. 

+The RootlessFrameID is an opaque object that is returned by the 

+implementation's CreateFrame() function. The generic rootless layer does 

+not use this frame id other than to pass it back to the rootless 

+implementation to indicate the frame to operate on.

+

+/*

+ * Create a new frame.

+ *  The frame is created unmapped.

+ *

+ *  pFrame      RootlessWindowPtr for this frame should be completely

+ *              initialized before calling except for pFrame->wid, which

+ *              is set by this function.

+ *  pScreen     Screen on which to place the new frame

+ *  newX, newY  Position of the frame.

+ *  pNewShape   Shape for the frame (in frame-local coordinates). NULL for

+ *              unshaped frames.

+ */

+typedef Bool (*RootlessCreateFrameProc)

+    (RootlessWindowPtr pFrame, ScreenPtr pScreen, int newX, int newY,

+     RegionPtr pNewShape);

+

+/*

+ * Destroy a frame.

+ *  Drawing is stopped and all updates are flushed before this is called.

+ *

+ *  wid         Frame id

+ */

+typedef void (*RootlessDestroyFrameProc)

+    (RootlessFrameID wid);

+

+/*

+ * Move a frame on screen.

+ *  Drawing is stopped and all updates are flushed before this is called.

+ *

+ *  wid         Frame id

+ *  pScreen     Screen to move the new frame to

+ *  newX, newY  New position of the frame

+ */

+typedef void (*RootlessMoveFrameProc) 

+    (RootlessFrameID wid, ScreenPtr pScreen, int newX, int newY);

+

+/*

+ * Resize and move a frame.

+ *  Drawing is stopped and all updates are flushed before this is called.

+ *

+ *  wid         Frame id

+ *  pScreen     Screen to move the new frame to

+ *  newX, newY  New position of the frame

+ *  newW, newH  New size of the frame

+ *  gravity     Gravity for window contents (rl_gravity_enum). This is always

+ *              RL_GRAVITY_NONE unless ROOTLESS_RESIZE_GRAVITY is set.

+ */

+typedef void (*RootlessResizeFrameProc)

+    (RootlessFrameID wid, ScreenPtr pScreen,

+     int newX, int newY, unsigned int newW, unsigned int newH,

+     unsigned int gravity);

+

+/*

+ * Change frame ordering (AKA stacking, layering).

+ *  Drawing is stopped before this is called. Unmapped frames are mapped by

+ *  setting their ordering.

+ *

+ *  wid         Frame id

+ *  nextWid     Frame id of frame that is now above this one or NULL if this

+ *              frame is at the top.

+ */

+typedef void (*RootlessRestackFrameProc)

+    (RootlessFrameID wid, RootlessFrameID nextWid);

+

+/*

+ * Change frame's shape.

+ *  Drawing is stopped before this is called.

+ *

+ *  wid         Frame id

+ *  pNewShape   New shape for the frame (in frame-local coordinates)

+ *              or NULL if now unshaped.

+ */

+typedef void (*RootlessReshapeFrameProc)

+    (RootlessFrameID wid, RegionPtr pNewShape);

+

+/*

+ * Unmap a frame.

+ *

+ *  wid         Frame id

+ */

+typedef void (*RootlessUnmapFrameProc)

+    (RootlessFrameID wid);

+

+/*

+ * Start drawing to a frame.

+ *  Prepare a frame for direct access to its backing buffer.

+ *

+ *  wid         Frame id

+ *  pixelData   Address of the backing buffer (returned)

+ *  bytesPerRow Width in bytes of the backing buffer (returned)

+ */

+typedef void (*RootlessStartDrawingProc)

+    (RootlessFrameID wid, char **pixelData, int *bytesPerRow);

+

+/*

+ * Stop drawing to a frame.

+ *  No drawing to the frame's backing buffer will occur until drawing

+ *  is started again.

+ *

+ *  wid         Frame id

+ *  flush       Flush drawing updates for this frame to the screen.

+ */

+typedef void (*RootlessStopDrawingProc)

+    (RootlessFrameID wid, Bool flush);

+

+/*

+ * Flush drawing updates to the screen.

+ *  Drawing is stopped before this is called.

+ *

+ *  wid         Frame id

+ *  pDamage     Region containing all the changed pixels in frame-local

+ *              coordinates. This is clipped to the window's clip.

+ */

+typedef void (*RootlessUpdateRegionProc)

+    (RootlessFrameID wid, RegionPtr pDamage);

+

+/*

+ * Mark damaged rectangles as requiring redisplay to screen.

+ *

+ *  wid         Frame id

+ *  nrects      Number of damaged rectangles

+ *  rects       Array of damaged rectangles in frame-local coordinates

+ *  shift_x,    Vector to shift rectangles by

+ *   shift_y

+ */

+typedef void (*RootlessDamageRectsProc)

+    (RootlessFrameID wid, int nrects, const BoxRec *rects,

+     int shift_x, int shift_y);

+

+/*

+ * Switch the window associated with a frame. (Optional)

+ *  When a framed window is reparented, the frame is resized and set to

+ *  use the new top-level parent. If defined this function will be called

+ *  afterwards for implementation specific bookkeeping.

+ *

+ *  pFrame      Frame whose window has switched

+ *  oldWin      Previous window wrapped by this frame

+ */

+typedef void (*RootlessSwitchWindowProc)

+    (RootlessWindowPtr pFrame, WindowPtr oldWin);

+

+/*

+ * Copy bytes. (Optional)

+ *  Source and destinate may overlap and the right thing should happen.

+ *

+ *  width       Bytes to copy per row

+ *  height      Number of rows

+ *  src         Source data

+ *  srcRowBytes Width of source in bytes

+ *  dst         Destination data

+ *  dstRowBytes Width of destination in bytes

+ */

+typedef void (*RootlessCopyBytesProc)

+    (unsigned int width, unsigned int height,

+     const void *src, unsigned int srcRowBytes,

+     void *dst, unsigned int dstRowBytes);

+

+/*

+ * Copy area in frame to another part of frame. (Optional)

+ *

+ *  wid         Frame id

+ *  dstNrects   Number of rectangles to copy

+ *  dstRects    Array of rectangles to copy

+ *  dx, dy      Number of pixels away to copy area

+ */

+typedef void (*RootlessCopyWindowProc)

+    (RootlessFrameID wid, int dstNrects, const BoxRec *dstRects,

+     int dx, int dy);

+

diff --git a/xorg-server/miext/rootless/rootless.h b/xorg-server/miext/rootless/rootless.h
index 1046657c4..757e4d372 100644
--- a/xorg-server/miext/rootless/rootless.h
+++ b/xorg-server/miext/rootless/rootless.h
@@ -68,10 +68,6 @@ typedef struct _RootlessWindowRec {
 

     PixmapPtr pixmap;

 

-#ifdef ROOTLESS_TRACK_DAMAGE

-    RegionRec damage;

-#endif

-

     unsigned int is_drawing :1;	// Currently drawing?

     unsigned int is_reorder_pending :1;

     unsigned int is_offscreen :1;

@@ -80,38 +76,14 @@ typedef struct _RootlessWindowRec {
 

 

 /* Offset for screen-local to global coordinate transforms */

-#ifdef ROOTLESS_GLOBAL_COORDS

 extern int rootlessGlobalOffsetX;

 extern int rootlessGlobalOffsetY;

-#endif

 

 /* The minimum number of bytes or pixels for which to use the

    implementation's accelerated functions. */

 extern unsigned int rootless_CopyBytes_threshold;

-extern unsigned int rootless_FillBytes_threshold;

-extern unsigned int rootless_CompositePixels_threshold;

 extern unsigned int rootless_CopyWindow_threshold;

 

-/* Operations used by CompositePixels */

-enum rl_composite_op_enum {

-    RL_COMPOSITE_SRC = 0,

-    RL_COMPOSITE_OVER,

-};

-

-/* Data formats for depth field and composite functions */

-enum rl_depth_enum {

-    RL_DEPTH_NIL = 0,			/* null source when compositing */

-    RL_DEPTH_ARGB8888,

-    RL_DEPTH_RGB555,

-    RL_DEPTH_A8,			/* for masks when compositing */

-    RL_DEPTH_INDEX8,

-};

-

-/* Macro to form the composite function for CompositePixels */

-#define RL_COMPOSITE_FUNCTION(op, src_depth, mask_depth, dest_depth) \

-    (((op) << 24) | ((src_depth) << 16) \

-     | ((mask_depth) << 8) | ((dest_depth) << 0))

-

 /* Gravity for window contents during resizing */

 enum rl_gravity_enum {

     RL_GRAVITY_NONE             = 0,	/* no gravity, fill everything */

@@ -134,8 +106,7 @@ enum rl_gravity_enum {
  *              initialized before calling except for pFrame->wid, which

  *              is set by this function.

  *  pScreen     Screen on which to place the new frame

- *  newX, newY  Position of the frame. These will be identical to pFrame-x,

- *              pFrame->y unless ROOTLESS_GLOBAL_COORDS is set.

+ *  newX, newY  Position of the frame.

  *  pNewShape   Shape for the frame (in frame-local coordinates). NULL for

  *              unshaped frames.

  */

@@ -227,8 +198,7 @@ typedef void (*RootlessStartDrawingProc)
  *  is started again.

  *

  *  wid         Frame id

- *  flush       Flush drawing updates for this frame to the screen. This

- *              will always be FALSE if ROOTLESS_TRACK_DAMAGE is set.

+ *  flush       Flush drawing updates for this frame to the screen.

  */

 typedef void (*RootlessStopDrawingProc)

     (RootlessFrameID wid, Bool flush);

@@ -239,15 +209,13 @@ typedef void (*RootlessStopDrawingProc)
  *

  *  wid         Frame id

  *  pDamage     Region containing all the changed pixels in frame-lcoal

- *              coordinates. This is clipped to the window's clip. This

- *              will be NULL if ROOTLESS_TRACK_DAMAGE is not set.

+ *              coordinates. This is clipped to the window's clip.

  */

 typedef void (*RootlessUpdateRegionProc)

     (RootlessFrameID wid, RegionPtr pDamage);

 

 /*

  * Mark damaged rectangles as requiring redisplay to screen.

- *  This will only be called if ROOTLESS_TRACK_DAMAGE is not set.

  *

  *  wid         Frame id

  *  nrects      Number of damaged rectangles

@@ -302,44 +270,6 @@ typedef void (*RootlessCopyBytesProc)
      void *dst, unsigned int dstRowBytes);

 

 /*

- * Fill memory with 32-bit pattern. (Optional)

- *

- *  width       Bytes to fill per row

- *  height      Number of rows

- *  value       32-bit pattern to fill with

- *  dst         Destination data

- *  dstRowBytes Width of destination in bytes

- */

-typedef void (*RootlessFillBytesProc)

-    (unsigned int width, unsigned int height, unsigned int value,

-     void *dst, unsigned int dstRowBytes);

-

-/*

- * Composite pixels from source and mask to destination. (Optional)

- *

- *  width, height   Size of area to composite to in pizels

- *  function        Composite function built with RL_COMPOSITE_FUNCTION

- *  src             Source data

- *  srcRowBytes     Width of source in bytes (Passing NULL means source

- *                  is a single pixel.

- *  mask            Mask data

- *  maskRowBytes    Width of mask in bytes

- *  dst             Destination data

- *  dstRowBytes     Width of destination in bytes

- *

- *  For src and dst, the first element of the array is the color data. If

- *  the second element is non-null it implies there is alpha data (which

- *  may be meshed or planar). Data without alpha is assumed to be opaque.

- *

- *  An X11 error code is returned.

- */

-typedef int (*RootlessCompositePixelsProc)

-    (unsigned int width, unsigned int height, unsigned int function,

-     void *src[2], unsigned int srcRowBytes[2],

-     void *mask, unsigned int maskRowBytes,

-     void *dst[2], unsigned int dstRowBytes[2]);

-

-/*

  * Copy area in frame to another part of frame. (Optional)

  *

  *  wid         Frame id

@@ -374,9 +304,7 @@ typedef struct _RootlessFrameProcs {
     RootlessStartDrawingProc StartDrawing;

     RootlessStopDrawingProc StopDrawing;

     RootlessUpdateRegionProc UpdateRegion;

-#ifndef ROOTLESS_TRACK_DAMAGE

     RootlessDamageRectsProc DamageRects;

-#endif

 

     /* Optional frame functions */

     RootlessSwitchWindowProc SwitchWindow;

@@ -386,8 +314,6 @@ typedef struct _RootlessFrameProcs {
 

     /* Optional acceleration functions */

     RootlessCopyBytesProc CopyBytes;

-    RootlessFillBytesProc FillBytes;

-    RootlessCompositePixelsProc CompositePixels;

     RootlessCopyWindowProc CopyWindow;

 } RootlessFrameProcsRec, *RootlessFrameProcsPtr;

 

@@ -398,13 +324,6 @@ typedef struct _RootlessFrameProcs {
 Bool RootlessInit(ScreenPtr pScreen, RootlessFrameProcsPtr procs);

 

 /*

- * Initialize acceleration for rootless mode on a given screen.

- *  Note: RootlessAccelInit() must be called before DamageSetup()

- *  and RootlessInit() must be called afterwards.

- */

-Bool RootlessAccelInit(ScreenPtr pScreen);

-

-/*

  * Return the frame ID for the physical window displaying the given window. 

  *

  *  create      If true and the window has no frame, attempt to create one

@@ -426,8 +345,7 @@ void RootlessStartDrawing(WindowPtr pWindow);
 /*

  * Finish drawing to a window's backing buffer.

  *

- *  flush       If true and ROOTLESS_TRACK_DAMAGE is set, damaged areas

- *              are flushed to the screen.

+ *  flush       If true, damaged areas are flushed to the screen.

  */

 void RootlessStopDrawing(WindowPtr pWindow, Bool flush);

 

diff --git a/xorg-server/miext/rootless/rootlessCommon.c b/xorg-server/miext/rootless/rootlessCommon.c
index 4f059801b..3ea3e5970 100644
--- a/xorg-server/miext/rootless/rootlessCommon.c
+++ b/xorg-server/miext/rootless/rootlessCommon.c
@@ -40,13 +40,9 @@
 #include "colormapst.h"

 

 unsigned int rootless_CopyBytes_threshold = 0;

-unsigned int rootless_FillBytes_threshold = 0;

-unsigned int rootless_CompositePixels_threshold = 0;

 unsigned int rootless_CopyWindow_threshold = 0;

-#ifdef ROOTLESS_GLOBAL_COORDS

 int rootlessGlobalOffsetX = 0;

 int rootlessGlobalOffsetY = 0;

-#endif

 

 RegionRec rootlessHugeRoot = {{-32767, -32767, 32767, 32767}, NULL};

 

@@ -305,16 +301,11 @@ RootlessDamageRegion(WindowPtr pWindow, RegionPtr pRegion)
             if (in == rgnIN) {

             /* clip totally contains pRegion */

 

-#ifdef ROOTLESS_TRACK_DAMAGE

-                RegionUnion(&winRec->damage,

-                                 &winRec->damage, (pRegion));

-#else

                 SCREENREC(pWindow->drawable.pScreen)->imp->

                     DamageRects(winRec->wid,

                                 RegionNumRects(pRegion),

                                 RegionRects(pRegion),

                                 -winRec->x, -winRec->y);

-#endif

 

                 RootlessQueueRedisplay(pTop->drawable.pScreen);

                 goto out;

@@ -331,16 +322,11 @@ RootlessDamageRegion(WindowPtr pWindow, RegionPtr pRegion)
         RegionNull(&clipped);

         RegionIntersect(&clipped, &pWindow->borderClip, pRegion);

 

-#ifdef ROOTLESS_TRACK_DAMAGE

-        RegionUnion(&winRec->damage,

-                     &winRec->damage, (pRegion));

-#else

         SCREENREC(pWindow->drawable.pScreen)->imp->

             DamageRects(winRec->wid,

                         RegionNumRects(&clipped),

                         RegionRects(&clipped),

                         -winRec->x, -winRec->y);

-#endif

 

         RegionUninit(&clipped);

 

@@ -415,32 +401,7 @@ RootlessDamageRect(WindowPtr pWindow, int x, int y, int w, int h)
 void

 RootlessRedisplay(WindowPtr pWindow)

 {

-#ifdef ROOTLESS_TRACK_DAMAGE

-

-    RootlessWindowRec *winRec = WINREC(pWindow);

-    ScreenPtr pScreen = pWindow->drawable.pScreen;

-

-    RootlessStopDrawing(pWindow, FALSE);

-

-    if (RegionNotEmpty(&winRec->damage)) {

-        RL_DEBUG_MSG("Redisplay Win 0x%x, %i x %i @ (%i, %i)\n",

-                     pWindow, winRec->width, winRec->height,

-                     winRec->x, winRec->y);

-

-        // move region to window local coords

-        RegionTranslate(&winRec->damage,

-                         -winRec->x, -winRec->y);

-

-        SCREENREC(pScreen)->imp->UpdateRegion(winRec->wid, &winRec->damage);

-

-        RegionEmpty(&winRec->damage);

-    }

-

-#else   /* !ROOTLESS_TRACK_DAMAGE */

-

     RootlessStopDrawing(pWindow, TRUE);

-

-#endif

 }

 

 

diff --git a/xorg-server/miext/rootless/rootlessConfig.h b/xorg-server/miext/rootless/rootlessConfig.h
index 50bac3f51..1ad3afcf0 100644
--- a/xorg-server/miext/rootless/rootlessConfig.h
+++ b/xorg-server/miext/rootless/rootlessConfig.h
@@ -1,66 +1,62 @@
-/*
- * Platform specific rootless configuration
- */
-/*
- * Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.
- *
- * 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
- * THE ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright
- * holders shall not be used in advertising or otherwise to promote the sale,
- * use or other dealings in this Software without prior written authorization.
- */
-
-#ifdef HAVE_DIX_CONFIG_H
-#include <dix-config.h>
-#endif
-
-#ifndef _ROOTLESSCONFIG_H
-#define _ROOTLESSCONFIG_H
-
-#ifdef __APPLE__
-
-# define ROOTLESS_GLOBAL_COORDS TRUE
-# define ROOTLESS_PROTECT_ALPHA TRUE
-# define ROOTLESS_REDISPLAY_DELAY 10
-# define ROOTLESS_RESIZE_GRAVITY TRUE
-# undef  ROOTLESS_TRACK_DAMAGE
-/*# define ROOTLESSDEBUG*/
-
-/* Bit mask for alpha channel with a particular number of bits per
-   pixel. Note that we only care for 32bpp data. Mac OS X uses planar
-   alpha for 16bpp. */
-# define RootlessAlphaMask(bpp) ((bpp) == 32 ? 0xFF000000 : 0)
-
-#endif /* __APPLE__ */
-
-#if defined(__CYGWIN__) || defined(WIN32)
-
-# define ROOTLESS_GLOBAL_COORDS TRUE
-# define ROOTLESS_PROTECT_ALPHA NO
-# define ROOTLESS_REDISPLAY_DELAY 10
-# undef  ROOTLESS_RESIZE_GRAVITY
-# undef  ROOTLESS_TRACK_DAMAGE
-/*# define ROOTLESSDEBUG*/
-
-# define RootlessAlphaMask(bpp) ((bpp) == 32 ? 0xFF000000 : 0)
-
-#endif /* __CYGWIN__ */
-
-#endif /* _ROOTLESSCONFIG_H */
+/*

+ * Platform specific rootless configuration

+ */

+/*

+ * Copyright (c) 2003 Torrey T. Lyons. All Rights Reserved.

+ *

+ * 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

+ * THE ABOVE LISTED COPYRIGHT HOLDER(S) 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(s) of the above copyright

+ * holders shall not be used in advertising or otherwise to promote the sale,

+ * use or other dealings in this Software without prior written authorization.

+ */

+

+#ifdef HAVE_DIX_CONFIG_H

+#include <dix-config.h>

+#endif

+

+#ifndef _ROOTLESSCONFIG_H

+#define _ROOTLESSCONFIG_H

+

+#ifdef __APPLE__

+

+# define ROOTLESS_PROTECT_ALPHA TRUE

+# define ROOTLESS_REDISPLAY_DELAY 10

+# define ROOTLESS_RESIZE_GRAVITY TRUE

+/*# define ROOTLESSDEBUG*/

+

+/* Bit mask for alpha channel with a particular number of bits per

+   pixel. Note that we only care for 32bpp data. Mac OS X uses planar

+   alpha for 16bpp. */

+# define RootlessAlphaMask(bpp) ((bpp) == 32 ? 0xFF000000 : 0)

+

+#endif /* __APPLE__ */

+

+#if defined(__CYGWIN__) || defined(WIN32)

+

+# define ROOTLESS_PROTECT_ALPHA NO

+# define ROOTLESS_REDISPLAY_DELAY 10

+# undef  ROOTLESS_RESIZE_GRAVITY

+/*# define ROOTLESSDEBUG*/

+

+# define RootlessAlphaMask(bpp) ((bpp) == 32 ? 0xFF000000 : 0)

+

+#endif /* __CYGWIN__ */

+

+#endif /* _ROOTLESSCONFIG_H */

diff --git a/xorg-server/miext/rootless/rootlessGC.c b/xorg-server/miext/rootless/rootlessGC.c
index 444342f6a..21a3bd806 100644
--- a/xorg-server/miext/rootless/rootlessGC.c
+++ b/xorg-server/miext/rootless/rootlessGC.c
@@ -148,9 +148,6 @@ static GCOps rootlessGCOps = {
 };

 

 /*

-   There are two issues we must contend with when drawing. These are

-   controlled with ROOTLESS_PROTECT_ALPHA and RootlessAccelInit().

-

    If ROOTLESS_PROTECT_ALPHA is set, we have to make sure that the alpha

    channel of the on screen windows is always opaque. fb makes this harder

    than it would otherwise be by noticing that a planemask of 0x00ffffff

@@ -171,21 +168,8 @@ static GCOps rootlessGCOps = {
    can do this when drawing op is GXcopy. We can also do this when copying

    from another window since its alpha channel must also be opaque.

 

-   The other issue to consider is that the rootless implementation may

-   provide accelerated drawing functions if RootlessAccelInit() is called.For 

-   some drawing primitives we swap in rootless acceleration functions, which

-   use the accelerated drawing functions where possible.

-

-   Where both alpha protection and acceleration is used, it is even a bigger

-   win to relax the planemask to all ones because most accelerated drawing

-   functions can only be used in this case. However, even if we can't set

-   the planemask to all ones, we can still use the accelerated

-   CompositePixels function for GXcopy if it is a forward copy. This is

-   mainly intended for copying from pixmaps to windows. The CompositePixels

-   operation used sets alpha to 0xFF during the copy.

-

-   The three macros below are used to implement this, potentially accelerated

-   drawing ops look something like this:

+   The three macros below are used to implement this. Drawing ops that can

+   potentially have their planemask relaxed look like:

 

    OP {

        GC_SAVE(gc);

@@ -285,16 +269,6 @@ canAccelFill(DrawablePtr pDraw, GCPtr pGC)
     return canAccelBlit(pDraw, pGC);

 }

 

-static unsigned int

-boxBytes(DrawablePtr pDraw, BoxRec *box)

-{

-    unsigned int pixels;

-

-    pixels = (box->x2 - box->x1) * (box->y2 - box->y1);

-

-    return pixels * (pDraw->bitsPerPixel >> 3);

-}

-

 

 /*

  * Screen function to create a graphics context

@@ -477,8 +451,7 @@ RootlessFillSpans(DrawablePtr dst, GCPtr pGC, int nInit,
 

         RootlessStartDrawing((WindowPtr) dst);

 

-        if (canAccelFill(dst, pGC) &&

-            boxBytes(dst, &box) >= rootless_FillBytes_threshold)

+        if (canAccelFill(dst, pGC))

         {

             GC_UNSET_PM(pGC, dst);

         }

@@ -584,15 +557,11 @@ RootlessCopyArea(DrawablePtr pSrc, DrawablePtr dst, GCPtr pGC,
     RL_DEBUG_MSG("copy area start (src 0x%x, dst 0x%x)", pSrc, dst);

 

     if (pSrc->type == DRAWABLE_WINDOW && IsFramedWindow((WindowPtr)pSrc)) {

-        unsigned int bytes;

-

         /* If both source and dest are windows, and we're doing

            a simple copy operation, we can remove the alpha-protecting

            planemask (since source has opaque alpha as well) */

 

-        bytes = w * h * (pSrc->depth >> 3);

-

-        if (bytes >= rootless_CopyBytes_threshold && canAccelBlit(pSrc, pGC))

+        if (canAccelBlit(pSrc, pGC))

         {

             GC_UNSET_PM(pGC, dst);

         }

@@ -1064,8 +1033,7 @@ static void RootlessFillPolygon(DrawablePtr dst, GCPtr pGC,
 

         RootlessStartDrawing((WindowPtr) dst);

 

-        if (canAccelFill(dst, pGC) &&

-            boxBytes(dst, &box) >= rootless_FillBytes_threshold)

+        if (canAccelFill(dst, pGC))

         {

             GC_UNSET_PM(pGC, dst);

         }

@@ -1117,8 +1085,7 @@ static void RootlessPolyFillRect(DrawablePtr dst, GCPtr pGC,
 

         RootlessStartDrawing((WindowPtr) dst);

  

-        if (canAccelFill(dst, pGC) &&

-            boxBytes(dst, &box) >= rootless_FillBytes_threshold)

+        if (canAccelFill(dst, pGC))

         {

             GC_UNSET_PM(pGC, dst);

         }

@@ -1170,8 +1137,7 @@ static void RootlessPolyFillArc(DrawablePtr dst, GCPtr pGC,
 

         RootlessStartDrawing((WindowPtr) dst);

 

-        if (canAccelFill(dst, pGC) &&

-            boxBytes(dst, &box) >= rootless_FillBytes_threshold)

+        if (canAccelFill(dst, pGC))

         {

             GC_UNSET_PM(pGC, dst);

         }

@@ -1221,8 +1187,7 @@ static void RootlessImageText8(DrawablePtr dst, GCPtr pGC,
 

         RootlessStartDrawing((WindowPtr) dst);

 

-        if (canAccelFill(dst, pGC) &&

-            boxBytes(dst, &box) >= rootless_FillBytes_threshold)

+        if (canAccelFill(dst, pGC))

         {

             GC_UNSET_PM(pGC, dst);

         }

@@ -1309,8 +1274,7 @@ static void RootlessImageText16(DrawablePtr dst, GCPtr pGC,
 

         RootlessStartDrawing((WindowPtr) dst);

 

-        if (canAccelFill(dst, pGC) &&

-            boxBytes(dst, &box) >= rootless_FillBytes_threshold)

+        if (canAccelFill(dst, pGC))

         {

             GC_UNSET_PM(pGC, dst);

         }

@@ -1408,8 +1372,7 @@ static void RootlessImageGlyphBlt(DrawablePtr dst, GCPtr pGC,
 

         RootlessStartDrawing((WindowPtr) dst);

 

-        if (canAccelFill(dst, pGC) &&

-            boxBytes(dst, &box) >= rootless_FillBytes_threshold)

+        if (canAccelFill(dst, pGC))

         {

             GC_UNSET_PM(pGC, dst);

         }

diff --git a/xorg-server/miext/rootless/rootlessWindow.c b/xorg-server/miext/rootless/rootlessWindow.c
index e4fde4395..a86020cc5 100644
--- a/xorg-server/miext/rootless/rootlessWindow.c
+++ b/xorg-server/miext/rootless/rootlessWindow.c
@@ -51,15 +51,10 @@ extern Bool no_configure_window;
 #include "rootlessCommon.h"

 #include "rootlessWindow.h"

 

-#ifdef ROOTLESS_GLOBAL_COORDS

 #define SCREEN_TO_GLOBAL_X \

     (pScreen->x + rootlessGlobalOffsetX)

 #define SCREEN_TO_GLOBAL_Y \

     (pScreen->y + rootlessGlobalOffsetY)

-#else

-#define SCREEN_TO_GLOBAL_X 0

-#define SCREEN_TO_GLOBAL_Y 0

-#endif

 

 #define DEFINE_ATOM_HELPER(func,atom_name)                      \

   static Atom func (void) {                                       \

@@ -180,11 +175,6 @@ static void
 RootlessDestroyFrame(WindowPtr pWin, RootlessWindowPtr winRec)

 {

     SCREENREC(pWin->drawable.pScreen)->imp->DestroyFrame(winRec->wid);

-

-#ifdef ROOTLESS_TRACK_DAMAGE

-    RegionUninit(&winRec->damage);

-#endif

-

     free(winRec);

     SETWINREC(pWin, NULL);

 }

@@ -341,15 +331,6 @@ RootlessPositionWindow(WindowPtr pWin, int x, int y)
 

             winRec->pixmap->devPrivate.ptr = winRec->pixelData;

             SetPixmapBaseToScreen(winRec->pixmap, x - bw, y - bw);

-

-#ifdef ROOTLESS_TRACK_DAMAGE

-            // Move damaged region to correspond to new window position

-            if (RegionNotEmpty(&winRec->damage)) {

-                RegionTranslate(&winRec->damage,

-                                 x - bw - winRec->x,

-                                 y - bw - winRec->y);

-            }

-#endif

         }

     }

 

@@ -381,10 +362,6 @@ RootlessInitializeFrame(WindowPtr pWin, RootlessWindowRec *winRec)
     winRec->width = d->width + 2*bw;

     winRec->height = d->height + 2*bw;

     winRec->borderWidth = bw;

-

-#ifdef ROOTLESS_TRACK_DAMAGE

-    RegionNull(&winRec->damage);

-#endif

 }

 

 /*