summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston Sequoia <jeremyhu@apple.com>2013-10-31 08:57:56 -0700
committerKeith Packard <keithp@keithp.com>2013-10-31 18:16:11 -0700
commitabf5d5ac12437ebe156b4dd500c2acd69eea3654 (patch)
treef8a67172edc8801ac96f6b40da8030f13c86c72d
parente4636072949a76477fe7c9d54662a0b3536b1372 (diff)
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@apple.com> Reviewed-by: Adam Jackson <ajax@redhat.com> Signed-off-by: Keith Packard <keithp@keithp.com>
-rw-r--r--miext/damage/damage.c5
1 files changed, 1 insertions, 4 deletions
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index cc0299143..173fe5070 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);
}