diff options
| author | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2013-10-31 08:57:56 -0700 |
|---|---|---|
| committer | Jeremy Huddleston Sequoia <jeremyhu@apple.com> | 2013-11-02 09:28:47 -0700 |
| commit | 94b7f26aeda31cf55ff9b7c04f390ba6d35977e4 (patch) | |
| tree | c965bce8edf6f17061e07949826a25c773a8750d | |
| parent | 0a1628bca7b6c85054041312987b73e701aecb80 (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>
(cherry picked from commit abf5d5ac12437ebe156b4dd500c2acd69eea3654)
| -rw-r--r-- | miext/damage/damage.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/miext/damage/damage.c b/miext/damage/damage.c index a98c20ec0..3dc3180f3 100644 --- a/miext/damage/damage.c +++ b/miext/damage/damage.c @@ -439,10 +439,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); } |