summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorEmil Velikov <[email protected]>2013-11-01 16:44:10 +0000
committerEmil Velikov <[email protected]>2013-11-04 19:49:26 +0000
commit0a2bdbb76f9fecf34c6b5fb39b60fda745440e4f (patch)
tree9e2c54efd822f689074b39f4b351721b380e7674 /src
parent4e0ed59959ad38b9dd469d9924e6794c8d21abcf (diff)
st/xorg: handle updates to DamageUnregister API
xserver 1.14.99.2 simplified the DamageUnregister API, by dropping the drawable argument. Follow xf86-video-intel and xf86-video-vmware approach and handle the new API by checking XORG_VERSION_CURRENT. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=71110 Reported-by: Michał Górny <[email protected]> Reported-by: Vinson Lee <[email protected]> Tested-by: Vinson Lee <[email protected]> Reviewed-by: Brian Paul <[email protected]> Signed-off-by: Emil Velikov <[email protected]>
Diffstat (limited to 'src')
-rw-r--r--src/gallium/state_trackers/xorg/xorg_driver.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gallium/state_trackers/xorg/xorg_driver.c b/src/gallium/state_trackers/xorg/xorg_driver.c
index 097c3549ae8..d252545bb1f 100644
--- a/src/gallium/state_trackers/xorg/xorg_driver.c
+++ b/src/gallium/state_trackers/xorg/xorg_driver.c
@@ -1027,7 +1027,11 @@ drv_close_screen(CLOSE_SCREEN_ARGS_DECL)
#ifdef DRM_MODE_FEATURE_DIRTYFB
if (ms->damage) {
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0)
+ DamageUnregister(ms->damage);
+#else
DamageUnregister(&pScreen->GetScreenPixmap(pScreen)->drawable, ms->damage);
+#endif
DamageDestroy(ms->damage);
ms->damage = NULL;
}