summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2014-01-21 10:00:07 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2014-01-21 10:00:07 +0000
commit36b743aa8e246c7361436d93a41a1f844c168a7a (patch)
tree30797f937d87a8906f89126fba3cbeffe2fa6f44 /src
parent6a757eaa0903139183d16c3437bf86d58e62145e (diff)
sna: Reduce zeal of new gc->pCompositeClip
gc->pCompositeClip starts off NULL, just like sna_gc->priv. Reported-by: Arkadiusz Miskiewicz Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'src')
-rw-r--r--src/sna/sna_accel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index a9948552..4a6b8baa 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -15711,7 +15711,7 @@ sna_validate_gc(GCPtr gc, unsigned long changes, DrawablePtr drawable)
DBG(("%s(%p) changes=%lx, previous serial=%lx, drawable=%lx\n", __FUNCTION__, gc,
changes, gc->serialNumber, drawable->serialNumber));
- assert(gc->pCompositeClip != sna_gc(gc)->priv);
+ assert(gc->pCompositeClip == NULL || gc->pCompositeClip != sna_gc(gc)->priv);
if (changes & (GCClipMask|GCSubwindowMode) ||
drawable->serialNumber != (gc->serialNumber & DRAWABLE_SERIAL_BITS) ||