summaryrefslogtreecommitdiff
path: root/exa
diff options
context:
space:
mode:
authorAdam Jackson <ajax@redhat.com>2013-08-26 13:52:14 -0400
committerAdam Jackson <ajax@redhat.com>2013-09-10 14:28:09 -0400
commit28708a045de7d9043d20fb06b61c44a46eb5526b (patch)
treec74d2728fd289de3e1e41e2fdbfd7c06d453c36f /exa
parente657635dbe6b92875b0e88370557c2cbab673a49 (diff)
damage: Implicitly unregister on destroy
There's no reason not to, and it simplifies quite a few callers. 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 'exa')
-rw-r--r--exa/exa_classic.c1
-rw-r--r--exa/exa_migration_mixed.c1
-rw-r--r--exa/exa_mixed.c2
3 files changed, 0 insertions, 4 deletions
diff --git a/exa/exa_classic.c b/exa/exa_classic.c
index 1fa534bc6..0fa422fcd 100644
--- a/exa/exa_classic.c
+++ b/exa/exa_classic.c
@@ -192,7 +192,6 @@ exaModifyPixmapHeader_classic(PixmapPtr pPixmap, int width, int height,
* gpu memory, so there's no need to track damage.
*/
if (pExaPixmap->pDamage) {
- DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage);
DamageDestroy(pExaPixmap->pDamage);
pExaPixmap->pDamage = NULL;
}
diff --git a/exa/exa_migration_mixed.c b/exa/exa_migration_mixed.c
index 445c4fcbf..5e0bf152a 100644
--- a/exa/exa_migration_mixed.c
+++ b/exa/exa_migration_mixed.c
@@ -190,7 +190,6 @@ exaPrepareAccessReg_mixed(PixmapPtr pPixmap, int index, RegionPtr pReg)
* copy anymore. Drivers that prefer DFS, should fail prepare
* access.
*/
- DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage);
DamageDestroy(pExaPixmap->pDamage);
pExaPixmap->pDamage = NULL;
diff --git a/exa/exa_mixed.c b/exa/exa_mixed.c
index 0fb409102..3e2dcf263 100644
--- a/exa/exa_mixed.c
+++ b/exa/exa_mixed.c
@@ -139,7 +139,6 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
if (pPixData) {
if (pExaPixmap->driverPriv) {
if (pExaPixmap->pDamage) {
- DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage);
DamageDestroy(pExaPixmap->pDamage);
pExaPixmap->pDamage = NULL;
}
@@ -189,7 +188,6 @@ exaModifyPixmapHeader_mixed(PixmapPtr pPixmap, int width, int height, int depth,
if (pExaPixmap->sys_ptr) {
free(pExaPixmap->sys_ptr);
pExaPixmap->sys_ptr = NULL;
- DamageUnregister(&pPixmap->drawable, pExaPixmap->pDamage);
DamageDestroy(pExaPixmap->pDamage);
pExaPixmap->pDamage = NULL;
RegionEmpty(&pExaPixmap->validSys);