diff options
| author | Daniel Stone <[email protected]> | 2018-02-15 09:17:52 +0000 |
|---|---|---|
| committer | Daniel Stone <[email protected]> | 2018-02-16 14:04:19 +0000 |
| commit | ff5432dc506111788ef19d25466b8c4ac91478d3 (patch) | |
| tree | 7e79e5993dde440e796ea5f9da77d496b9cda0c5 /src | |
| parent | f766e1afa58b1e02e1f54c54f5cadadfc339ecf0 (diff) | |
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 <[email protected]>
Reviewed-by: Emil Velikov <[email protected]>
Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=105103
Fixes: 198af27c679c ("wayland-egl: rename wayland-egl-{priv,backend}.h")
Diffstat (limited to 'src')
| -rw-r--r-- | src/egl/drivers/dri2/egl_dri2.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h index 0f4e7a8d1e8..d36d02c3c49 100644 --- a/src/egl/drivers/dri2/egl_dri2.h +++ b/src/egl/drivers/dri2/egl_dri2.h @@ -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 |