xserver: Branch 'master'
Keith Packard
keithp at kemper.freedesktop.org
Fri Nov 1 02:16:54 CET 2013
miext/damage/damage.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
New commits:
commit abf5d5ac12437ebe156b4dd500c2acd69eea3654
Author: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Date: Thu Oct 31 08:57:56 2013 -0700
miext/damage: Partial revert of "Only wrap into the GC ops chain if there's a listener (v3)"
Fixes regression from: 4dc2a76740d921c824a4d8193f39dd373475f02a
http://lists.x.org/archives/xorg-devel/2013-May/036241.html
https://trac.macports.org/ticket/38993
Signed-off-by: Jeremy Huddleston Sequoia <jeremyhu at apple.com>
Reviewed-by: Adam Jackson <ajax at redhat.com>
Signed-off-by: Keith Packard <keithp at keithp.com>
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index cc02991..173fe50 100644
--- a/miext/damage/damage.c
+++ b/miext/damage/damage.c
@@ -382,10 +382,7 @@ damageValidateGC(GCPtr pGC, unsigned long changes, DrawablePtr pDrawable)
drawableDamage(pDrawable);
DAMAGE_GC_FUNC_PROLOGUE(pGC);
(*pGC->funcs->ValidateGC) (pGC, changes, pDrawable);
- if (pDamage)
- pGCPriv->ops = pGC->ops; /* so it's not NULL, so FUNC_EPILOGUE does work */
- else
- pGCPriv->ops = NULL;
+ pGCPriv->ops = pGC->ops; /* just so it's not NULL */
DAMAGE_GC_FUNC_EPILOGUE(pGC);
}
More information about the xorg-commit
mailing list