[Mesa-dev] [PATCH] egl/dri2: move wayland header inclusion where applicable

[Andy Furniss]

Emil Velikov wrote:
> From: Emil Velikov <emil.velikov at collabora.com>
> 
> Instead of indirectly pulling the wayland headers everywhere, use
> forward declarations and #include only as needed.
> 
> Should effectively fix build errors like the following:
> 
> make[5]: Entering directory
> '/.../src/gallium/state_trackers/omx/tizonia'
>     CC       h264dprc.lo
> In file included from h264dprc.c:45:0:
> .../src/egl/drivers/dri2/egl_dri2.h:47:10: fatal error:
> wayland/wayland-egl/wayland-egl-backend.h: No such file or directory
>    #include "wayland/wayland-egl/wayland-egl-backend.h"
> 
> Cc: Andy Furniss <adf.lists at gmail.com>
> Cc: Dylan Baker <dylan at pnwbakers.com>
> Signed-off-by: Emil Velikov <emil.velikov at collabora.com>
> ---
> Dylan had epiphany a minute after I hit Send. Sorry about that.
> 
> Gents this should remove the need of any the following patches.
> Please you give them a try, manually reverting the meson fix.

Autotools build is good for me with this patch.

> 
> Thanks!
> 
> https://patchwork.freedesktop.org/patch/208770/
> https://patchwork.freedesktop.org/patch/208306/
> https://patchwork.freedesktop.org/patch/208322/
> ---
>   src/egl/drivers/dri2/egl_dri2.c         |  1 +
>   src/egl/drivers/dri2/egl_dri2.h         | 12 +++++++++---
>   src/egl/drivers/dri2/platform_wayland.c |  2 ++
>   3 files changed, 12 insertions(+), 3 deletions(-)
> 
> diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
> index 864f7eb0c68..535806e4bfe 100644
> --- a/src/egl/drivers/dri2/egl_dri2.c
> +++ b/src/egl/drivers/dri2/egl_dri2.c
> @@ -48,6 +48,7 @@
>   #include <sys/stat.h>
>   
>   #ifdef HAVE_WAYLAND_PLATFORM
> +#include <wayland-client.h>
>   #include "wayland-drm.h"
>   #include "wayland-drm-client-protocol.h"
>   #include "linux-dmabuf-unstable-v1-client-protocol.h"
> diff --git a/src/egl/drivers/dri2/egl_dri2.h b/src/egl/drivers/dri2/egl_dri2.h
> index bd637f73c9d..adabc527f85 100644
> --- a/src/egl/drivers/dri2/egl_dri2.h
> +++ b/src/egl/drivers/dri2/egl_dri2.h
> @@ -43,9 +43,15 @@
>   #endif
>   
>   #ifdef HAVE_WAYLAND_PLATFORM
> -#include <wayland-client.h>
> -#include "wayland/wayland-egl/wayland-egl-backend.h"
> -/* forward declarations of protocol elements */
> +/* forward declarations to avoid pulling wayland headers everywhere */
> +struct wl_egl_window;
> +struct wl_event_queue;
> +struct wl_callback;
> +struct wl_display;
> +struct wl_drm;
> +struct wl_registry;
> +struct wl_shm;
> +struct wl_surface;
>   struct zwp_linux_dmabuf_v1;
>   #endif
>   
> diff --git a/src/egl/drivers/dri2/platform_wayland.c b/src/egl/drivers/dri2/platform_wayland.c
> index 877f7933b9a..94f7defa657 100644
> --- a/src/egl/drivers/dri2/platform_wayland.c
> +++ b/src/egl/drivers/dri2/platform_wayland.c
> @@ -49,6 +49,8 @@
>   #include "wayland-drm-client-protocol.h"
>   #include "linux-dmabuf-unstable-v1-client-protocol.h"
>   
> +#include "wayland/wayland-egl/wayland-egl-backend.h"
> +
>   #ifndef DRM_FORMAT_MOD_INVALID
>   #define DRM_FORMAT_MOD_INVALID ((1ULL << 56) - 1)
>   #endif
>