svn merge ^/branches/released .

2 files changed, 1 insertions, 12 deletions

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