[PATCH video-vmware] vmwgfx: handle changes of DamageUnregister API in 1.14.99.2

Gaetan Nadon memsize at videotron.ca
Mon Oct 21 22:34:55 CEST 2013


Fix is inspired from the intel driver.

Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
---

		*** Note that the build is currently broken ***

I have compiled successfully with xserver 1.14.99.1 and 1.14.99.3

 vmwgfx/vmwgfx_saa.c |    6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/vmwgfx/vmwgfx_saa.c b/vmwgfx/vmwgfx_saa.c
index fd80682..346e7f4 100644
--- a/vmwgfx/vmwgfx_saa.c
+++ b/vmwgfx/vmwgfx_saa.c
@@ -26,6 +26,7 @@
  */
 
 #include <xorg-server.h>
+#include <xorgVersion.h>
 #include <mi.h>
 #include <fb.h>
 #include <xf86drmMode.h>
@@ -76,7 +77,12 @@ vmwgfx_pixmap_remove_damage(PixmapPtr pixmap)
     if (!spix->damage || vpix->hw || vpix->gmr || vpix->malloc)
 	return;
 
+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0)
+    DamageUnregister(spix->damage);
+#else
     DamageUnregister(&pixmap->drawable, spix->damage);
+#endif
+
     DamageDestroy(spix->damage);
     spix->damage = NULL;
 }
-- 
1.7.9.5



More information about the xorg-devel mailing list