diff options
| author | Peter Maydell | 2021-02-19 23:20:17 +0100 |
|---|---|---|
| committer | Peter Maydell | 2021-02-19 23:20:17 +0100 |
| commit | d6798cc01d6edabaa4e326359b69f08d022bf4c7 (patch) | |
| tree | 3b8e38b434a5cdf4a668f2a2ac7f72100b1041b2 /include | |
| parent | Merge remote-tracking branch 'remotes/armbru/tags/pull-qapi-2021-02-18' into ... (diff) | |
| parent | ui/console: Remove dpy_gl_ctx_get_current (diff) | |
| download | qemu-d6798cc01d6edabaa4e326359b69f08d022bf4c7.tar.gz qemu-d6798cc01d6edabaa4e326359b69f08d022bf4c7.tar.xz qemu-d6798cc01d6edabaa4e326359b69f08d022bf4c7.zip | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20210219-pull-request' into staging
ui: spice bugfixes.
ui: first batch of cocoa updates.
# gpg: Signature made Fri 19 Feb 2021 22:00:14 GMT
# gpg: using RSA key A0328CFFB93A17A79901FE7D4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>" [full]
# gpg: aka "Gerd Hoffmann <gerd@kraxel.org>" [full]
# gpg: aka "Gerd Hoffmann (private) <kraxel@gmail.com>" [full]
# Primary key fingerprint: A032 8CFF B93A 17A7 9901 FE7D 4CB6 D8EE D3E8 7138
* remotes/kraxel/tags/ui-20210219-pull-request:
ui/console: Remove dpy_gl_ctx_get_current
ui/cocoa: Statically allocate dcl
ui/cocoa: Interpret left button down as is when command is pressed
spice-app: avoid crash when core spice module doesn't loaded
ui/cocoa: Do not copy members of pixman image
ui/cocoa: Support unique keys of JIS keyboards
spice: flush drawing before notifying client
spice: flush on GL update before notifying client
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/gtk.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/ui/gtk.h b/include/ui/gtk.h index 3c1cd98db8..5ae0ad60a6 100644 --- a/include/ui/gtk.h +++ b/include/ui/gtk.h @@ -147,7 +147,6 @@ void gd_gl_area_scanout_disable(DisplayChangeListener *dcl); void gd_gl_area_scanout_flush(DisplayChangeListener *dcl, uint32_t x, uint32_t y, uint32_t w, uint32_t h); void gtk_gl_area_init(void); -QEMUGLContext gd_gl_area_get_current_context(DisplayChangeListener *dcl); int gd_gl_area_make_current(DisplayChangeListener *dcl, QEMUGLContext ctx); |