xf86-video-intel: src/sna/sna_accel.c

[Chris Wilson]

 src/sna/sna_accel.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 36b743aa8e246c7361436d93a41a1f844c168a7a
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jan 21 10:00:07 2014 +0000

    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 at chris-wilson.co.uk>

diff --git a/src/sna/sna_accel.c b/src/sna/sna_accel.c
index a994855..4a6b8ba 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) ||