diff options
| author | marha <marha@users.sourceforge.net> | 2010-09-14 14:23:04 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-09-14 14:23:04 +0000 |
| commit | 2ddb14008968ea365e3d395487cad2bfe154da9d (patch) | |
| tree | f9d970e9dd6ee1ec835fedcadc15a8705a50e6d5 /xorg-server/miext/damage | |
| parent | b7a6351e37e788bb25415dc79aaf2718b48d6939 (diff) | |
| parent | 3815190d52f8ae453c2458335394eb5b18ab9bf5 (diff) | |
| download | vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.tar.gz vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.tar.bz2 vcxsrv-2ddb14008968ea365e3d395487cad2bfe154da9d.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/miext/damage')
| -rw-r--r-- | xorg-server/miext/damage/damage.c | 24 |
1 files changed, 0 insertions, 24 deletions
diff --git a/xorg-server/miext/damage/damage.c b/xorg-server/miext/damage/damage.c index cd69662ff..9b2917634 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
|