[PATCH 1/1] miext/damage: Partial revert of "Only wrap into the GC ops chain if there's a listener (v3)"
Jeremy Huddleston Sequoia
jeremyhu at apple.com
Thu Oct 31 16:57:56 CET 2013
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>
CC: Adam Jackson <ajax at redhat.com>
CC: Aaron Plattner <aplattner at nvidia.com>
CC: Keith Packard <keithp at keithp.com>
---
miext/damage/damage.c | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/miext/damage/damage.c b/miext/damage/damage.c
index a98c20e..3dc3180 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);
}
--
1.8.4.1
More information about the xorg-devel
mailing list