Skip to content
Snippets Groups Projects
Commit ff5432dc authored by Daniel Stone's avatar Daniel Stone
Browse files

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: default avatarDaniel Stone <daniels@collabora.com>
Reviewed-by: default avatarEmil Velikov <emil.velikov@collabora.com>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105103
Fixes: 198af27c ("wayland-egl: rename wayland-egl-{priv,backend}.h")
parent f766e1af
Loading
......@@ -44,7 +44,7 @@
#ifdef HAVE_WAYLAND_PLATFORM
#include <wayland-client.h>
#include "wayland-egl-backend.h"
#include "wayland/wayland-egl/wayland-egl-backend.h"
/* forward declarations of protocol elements */
struct zwp_linux_dmabuf_v1;
#endif
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment