diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-09-19 17:16:07 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-09-19 17:16:07 +0100 |
| commit | a77d20bafcd4cb7684168a9b4c6dc2a321aaeb50 (patch) | |
| tree | 6acc6b864c1ab5e7e8735fbd63fa6eb487d5cd76 /include | |
| parent | 084f67c9d98d520c51df24f3b355774166a03691 (diff) | |
| parent | 6bf21f3d83e95bcc4ba35a7a07cc6655e8b010b0 (diff) | |
| download | qemu-a77d20bafcd4cb7684168a9b4c6dc2a321aaeb50.zip qemu-a77d20bafcd4cb7684168a9b4c6dc2a321aaeb50.tar.gz qemu-a77d20bafcd4cb7684168a9b4c6dc2a321aaeb50.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190919-pull-request' into staging
ui: add barrier client.
ui: bugfixes for vnc & egl.
# gpg: Signature made Thu 19 Sep 2019 08:09:05 BST
# gpg: using RSA key 4CB6D8EED3E87138
# 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-20190919-pull-request:
vnc: fix memory leak when vnc disconnect
ui: add an embedded Barrier client
vnc: fix websocket field in events
ui/egl: fix framebuffer reads
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/egl-helpers.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h index dad19e9..94a4b3e 100644 --- a/include/ui/egl-helpers.h +++ b/include/ui/egl-helpers.h @@ -25,7 +25,7 @@ void egl_fb_setup_for_tex(egl_fb *fb, int width, int height, GLuint texture, bool delete); void egl_fb_setup_new_tex(egl_fb *fb, int width, int height); void egl_fb_blit(egl_fb *dst, egl_fb *src, bool flip); -void egl_fb_read(void *dst, egl_fb *src); +void egl_fb_read(DisplaySurface *dst, egl_fb *src); void egl_texture_blit(QemuGLShader *gls, egl_fb *dst, egl_fb *src, bool flip); void egl_texture_blend(QemuGLShader *gls, egl_fb *dst, egl_fb *src, bool flip, |