diff options
| author | Peter Maydell | 2019-01-23 18:57:47 +0100 |
|---|---|---|
| committer | Peter Maydell | 2019-01-23 18:57:47 +0100 |
| commit | f6b06fcceef465de0cf2514c9f76fe0192896781 (patch) | |
| tree | 9454c773ed95151b361c9402533925039e277daa /ui/egl-helpers.c | |
| parent | Merge remote-tracking branch 'remotes/edgar/tags/edgar/xilinx-next-2019-01-22... (diff) | |
| parent | egl-helpers.h: do not depend on X11 Window type, use EGLNativeWindowType (diff) | |
| download | qemu-f6b06fcceef465de0cf2514c9f76fe0192896781.tar.gz qemu-f6b06fcceef465de0cf2514c9f76fe0192896781.tar.xz qemu-f6b06fcceef465de0cf2514c9f76fe0192896781.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190121-pull-request' into staging
ui: highres logo for sdl and gtk, bugfixes for vnc and egl.
# gpg: Signature made Mon 21 Jan 2019 14:11:39 GMT
# gpg: using RSA key 4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20190121-pull-request:
egl-helpers.h: do not depend on X11 Window type, use EGLNativeWindowType
vnc: detect and optimize pageflips
sdl: add support for high resolution window icon
ui: fix icon display for GTK frontend under GNOME Shell with Wayland
ui: install logo icons to $prefix/share/icons
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'ui/egl-helpers.c')
| -rw-r--r-- | ui/egl-helpers.c | 4 |
1 files changed, 2 insertions, 2 deletions
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; |