diff options
author | Adam Jackson <ajax@redhat.com> | 2013-08-26 14:03:51 -0400 |
---|---|---|
committer | Adam Jackson <ajax@redhat.com> | 2013-09-10 14:28:35 -0400 |
commit | d08966227e7d567df8d26eebc80f35f886e59a4a (patch) | |
tree | 582089dde20de0aab4e987b42d220a016c96b580 /composite | |
parent | 28708a045de7d9043d20fb06b61c44a46eb5526b (diff) |
damage: Simplify DamageUnregister
You can only register one drawable on a given damage, so there's no
reason to require the caller to specify the drawable, the damage is
enough. The implementation would do something fairly horrible if you
_did_ pass mismatched drawable and damage, so let's avoid the problem
entirely.
v2: Simplify xf86RotateDestroy even more [anholt]
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Reviewed-by: Eric Anholt <eric@anholt.net>
Signed-off-by: Adam Jackson <ajax@redhat.com>
Diffstat (limited to 'composite')
-rw-r--r-- | composite/compalloc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/composite/compalloc.c b/composite/compalloc.c index cc69c68f2..b7d731e33 100644 --- a/composite/compalloc.c +++ b/composite/compalloc.c @@ -205,7 +205,7 @@ compRedirectWindow(ClientPtr pClient, WindowPtr pWin, int update) anyMarked = compMarkWindows(pWin, &pLayerWin); if (cw->damageRegistered) { - DamageUnregister(&pWin->drawable, cw->damage); + DamageUnregister(cw->damage); cw->damageRegistered = FALSE; } cw->update = CompositeRedirectManual; @@ -638,7 +638,7 @@ compSetParentPixmap(WindowPtr pWin) CompWindowPtr cw = GetCompWindow(pWin); if (cw->damageRegistered) { - DamageUnregister(&pWin->drawable, cw->damage); + DamageUnregister(cw->damage); cw->damageRegistered = FALSE; DamageEmpty(cw->damage); } |