aboutsummaryrefslogtreecommitdiff
path: root/xorg-server/fb/fbgc.c
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-09-14 14:23:04 +0000
committermarha <marha@users.sourceforge.net>2010-09-14 14:23:04 +0000
commit2ddb14008968ea365e3d395487cad2bfe154da9d (patch)
treef9d970e9dd6ee1ec835fedcadc15a8705a50e6d5 /xorg-server/fb/fbgc.c
parentb7a6351e37e788bb25415dc79aaf2718b48d6939 (diff)
parent3815190d52f8ae453c2458335394eb5b18ab9bf5 (diff)
downloadvcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.tar.gz
vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.tar.bz2
vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.zip
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/fb/fbgc.c')
-rw-r--r--xorg-server/fb/fbgc.c12
1 files changed, 1 insertions, 11 deletions
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