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 <alex.kanavin@gmail.com>
---
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);
}
--
2.17.1
Cc'ing Gerd again. $ ./scripts/get_maintainer.pl -f include/ui/egl-helpers.h Gerd Hoffmann <kraxel@redhat.com> (odd fixer:Graphics) qemu-devel@nongnu.org (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 <alex.kanavin@gmail.com> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> > --- > 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); > } >
Patchew URL: https://patchew.org/QEMU/20190116113751.17177-1-alex.kanavin@gmail.com/ Hi, This series seems to have some coding style problems. See output below for more information: Subject: [Qemu-devel] [PATCH] egl-helpers.h: do not depend on X11 Window type, use EGLNativeWindowType Message-id: 20190116113751.17177-1-alex.kanavin@gmail.com Type: series === TEST SCRIPT BEGIN === #!/bin/bash git config --local diff.renamelimit 0 git config --local diff.renames True git config --local diff.algorithm histogram ./scripts/checkpatch.pl --mailback base.. === TEST SCRIPT END === Updating 3c8cf5a9c21ff8782164d1def7f44bd888713384 Switched to a new branch 'test' e9b284a egl-helpers.h: do not depend on X11 Window type, use EGLNativeWindowType === OUTPUT BEGIN === ERROR: line over 90 characters #57: FILE: ui/gtk-egl.c:57: + vc->gfx.esurface = qemu_egl_init_surface_x11(vc->gfx.ectx, (EGLNativeWindowType)x11_window); total: 1 errors, 0 warnings, 32 lines checked Commit e9b284a96c5d (egl-helpers.h: do not depend on X11 Window type, use EGLNativeWindowType) has style problems, please review. If any of these errors are false positives report them to the maintainer, see CHECKPATCH in MAINTAINERS. === OUTPUT END === Test command exited with code: 1 The full log is available at http://patchew.org/logs/20190116113751.17177-1-alex.kanavin@gmail.com/testing.checkpatch/?type=message. --- Email generated automatically by Patchew [http://patchew.org/]. Please send your feedback to patchew-devel@redhat.com
© 2016 - 2024 Red Hat, Inc.