diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2018-06-26 16:44:57 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2018-06-26 16:44:57 +0100 |
| commit | 0ab4c574a55448a37b9f616259b82950742c9427 (patch) | |
| tree | 760945aa3534ab90f10959e58870cc8a394502fe /include/ui/gtk.h | |
| parent | bd4e4a387aa733e40270a7406c7d111f2292de65 (diff) | |
| parent | 49213b721f4620364aa09142b5f4d559fed26b53 (diff) | |
| download | focaccia-qemu-0ab4c574a55448a37b9f616259b82950742c9427.tar.gz focaccia-qemu-0ab4c574a55448a37b9f616259b82950742c9427.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20180626-pull-request' into staging
ui: sdl2 fixes, gles support. # gpg: Signature made Tue 26 Jun 2018 14:56:15 BST # 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-20180626-pull-request: sdl2: add checking for NULL sdl2: fix copypaste issues Add gles support to egl-helpers, wire up in egl-headless and gtk. Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/ui/gtk.h')
| -rw-r--r-- | include/ui/gtk.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ui/gtk.h b/include/ui/gtk.h index 2922fc64b2..a79780afc7 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -127,7 +127,7 @@ void gd_egl_release_dmabuf(DisplayChangeListener *dcl, QemuDmaBuf *dmabuf); void gd_egl_scanout_flush(DisplayChangeListener *dcl, uint32_t x, uint32_t y, uint32_t w, uint32_t h); -void gtk_egl_init(void); +void gtk_egl_init(DisplayGLMode mode); int gd_egl_make_current(DisplayChangeListener *dcl, QEMUGLContext ctx); |