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

Jakob Bornecrantz wallbraker at gmail.com
Mon Nov 18 06:47:52 PST 2013


Thanks, sorry for missing this, pushed to master.

Cheers, Jakob.

On Mon, Oct 28, 2013 at 11:21 PM, Gaetan Nadon <memsize at videotron.ca> wrote:
> Fix is inspired from the intel driver.
>
> Signed-off-by: Gaetan Nadon <memsize at videotron.ca>
> ---
>  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
>
> _______________________________________________
> xorg-devel at lists.x.org: X.Org development
> Archives: http://lists.x.org/archives/xorg-devel
> Info: http://lists.x.org/mailman/listinfo/xorg-devel


More information about the xorg-devel mailing list