Re: [Qemu-devel] [PATCH] egl-helpers.h: do not depend on X11 Window type, use EGLNativeWindowType

[Philippe Mathieu-Daudé]

Cc'ing Gerd again.

$ ./scripts/get_maintainer.pl -f include/ui/egl-helpers.h
Gerd Hoffmann <address@hidden> (odd fixer:Graphics)
address@hidden (open list:All patches CC here)

On 1/16/19 12:37 PM, Alexander Kanavin wrote:
> It was assumed that mesa provides the necessary X11 includes,
> but it is not always the case, as it can be configured without x11 support.
> 
> Signed-off-by: Alexander Kanavin <address@hidden>

Reviewed-by: Philippe Mathieu-Daudé <address@hidden>

> ---
>  include/ui/egl-helpers.h | 2 +-
>  ui/egl-helpers.c         | 4 ++--
>  ui/gtk-egl.c             | 2 +-
>  3 files changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h
> index 9db7293bdb..3fc656a7ba 100644
> --- a/include/ui/egl-helpers.h
> +++ b/include/ui/egl-helpers.h
> @@ -43,7 +43,7 @@ void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf);
>  
>  #endif
>  
> -EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win);
> +EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, EGLNativeWindowType 
> win);
>  
>  int qemu_egl_init_dpy_x11(EGLNativeDisplayType dpy, DisplayGLMode mode);
>  int qemu_egl_init_dpy_mesa(EGLNativeDisplayType dpy, DisplayGLMode mode);
> diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c
> index 4f475142fc..5e115b3fb4 100644
> --- a/ui/egl-helpers.c
> +++ b/ui/egl-helpers.c
> @@ -273,14 +273,14 @@ void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf)
>  
>  /* ---------------------------------------------------------------------- */
>  
> -EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win)
> +EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, EGLNativeWindowType 
> win)
>  {
>      EGLSurface esurface;
>      EGLBoolean b;
>  
>      esurface = eglCreateWindowSurface(qemu_egl_display,
>                                        qemu_egl_config,
> -                                      (EGLNativeWindowType)win, NULL);
> +                                      win, NULL);
>      if (esurface == EGL_NO_SURFACE) {
>          error_report("egl: eglCreateWindowSurface failed");
>          return NULL;
> diff --git a/ui/gtk-egl.c b/ui/gtk-egl.c
> index 5420c2362b..1f9411626a 100644
> --- a/ui/gtk-egl.c
> +++ b/ui/gtk-egl.c
> @@ -54,7 +54,7 @@ void gd_egl_init(VirtualConsole *vc)
>      }
>  
>      vc->gfx.ectx = qemu_egl_init_ctx();
> -    vc->gfx.esurface = qemu_egl_init_surface_x11(vc->gfx.ectx, x11_window);
> +    vc->gfx.esurface = qemu_egl_init_surface_x11(vc->gfx.ectx, 
> (EGLNativeWindowType)x11_window);
>  
>      assert(vc->gfx.esurface);
>  }
>