egl/wayland: Always use in-tree wayland-egl-backend.h
authorDaniel Stone <daniels@collabora.com>
Thu, 15 Feb 2018 09:17:52 +0000 (09:17 +0000)
committerDaniel Stone <daniels@collabora.com>
Fri, 16 Feb 2018 14:04:19 +0000 (14:04 +0000)
commitff5432dc506111788ef19d25466b8c4ac91478d3
tree7e79e5993dde440e796ea5f9da77d496b9cda0c5
parentf766e1afa58b1e02e1f54c54f5cadadfc339ecf0
egl/wayland: Always use in-tree wayland-egl-backend.h

A recent patchset to Wayland[0] migrated Mesa's libwayland-egl backend
into Wayland itself, so implementations could provide backends. Mesa
still uses its own, and the two have already diverged[1].

The include from egl_dri2.h could pick up either the installed Wayland
wayland-egl-backend.h (with a 'driver_private' member), or the Mesa
internal wayland-egl-backend.h (with a 'private' member), failing the
build in the first instance.

Add an explicit directory prefix to the include, so we always get our
in-tree version.

[0]: https://patchwork.freedesktop.org/series/31663/
[1]: https://cgit.freedesktop.org/wayland/wayland/commit/?id=9fa60983b579

Signed-off-by: Daniel Stone <daniels@collabora.com>
Reviewed-by: Emil Velikov <emil.velikov@collabora.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105103
Fixes: 198af27c679c ("wayland-egl: rename wayland-egl-{priv,backend}.h")
src/egl/drivers/dri2/egl_dri2.h