[Mesa-dev] [PATCH] st/xorg: handle updates to DamageUnregister API

[Brian Paul]

On 11/01/2013 11:02 AM, Emil Velikov wrote:
> 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 <mgorny at gentoo.org>
> Reported-by: Vinson Lee <vlee at freedesktop.org>
> Signed-off-by: Emil Velikov <emil.l.velikov at gmail.com>
> ---
>   src/gallium/state_trackers/xorg/xorg_driver.c | 4 ++++
>   1 file changed, 4 insertions(+)
>
> diff --git a/src/gallium/state_trackers/xorg/xorg_driver.c b/src/gallium/state_trackers/xorg/xorg_driver.c
> index 097c354..d252545 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;
>       }
>

LGTM.
Reviewed-by: Brian Paul <brianp at vmware.com>