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

Chris Wilson ickle at kemper.freedesktop.org
Tue Jan 21 02:36:30 PST 2014


 src/sna/sna_accel.c |    2 --
 1 file changed, 2 deletions(-)

New commits:
commit 720d131963b5c4d8f9e63c8852dbc133544ad312
Author: Chris Wilson <chris at chris-wilson.co.uk>
Date:   Tue Jan 21 10:35:30 2014 +0000

    sna: Drop bogus assert added in recent patches
    
    The intention was to detect if the gc->pCompositeClip still pointed to
    the temporary region. However, the assert failed to accomplish that
    goal.
    
    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 4a6b8ba..4a2b614 100644
--- a/src/sna/sna_accel.c
+++ b/src/sna/sna_accel.c
@@ -15711,8 +15711,6 @@ 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 == NULL || gc->pCompositeClip != sna_gc(gc)->priv);
-
 	if (changes & (GCClipMask|GCSubwindowMode) ||
 	    drawable->serialNumber != (gc->serialNumber & DRAWABLE_SERIAL_BITS) ||
 	    (gc->clientClipType != CT_NONE && (changes & (GCClipXOrigin | GCClipYOrigin)))) {


More information about the xorg-commit mailing list