diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2017-02-20 16:31:38 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2017-02-20 16:31:38 +0000 |
| commit | c8f21dbfc3dea943ca5edac2f00058477ecb5b6b (patch) | |
| tree | bc1e072313852a03d487a20da639a93ba354211d /include | |
| parent | 6753e4ed150ca1f94651aad06c031680a0be6cac (diff) | |
| parent | 0ea1523fb6703aa0dcd65e66b59e96fec028e60a (diff) | |
| download | qemu-c8f21dbfc3dea943ca5edac2f00058477ecb5b6b.tar.gz | |
Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170220-1' into staging
ui: opengl fixes, for spice and egl-helpers.
# gpg: Signature made Mon 20 Feb 2017 13:12:46 GMT
# gpg: using RSA key 0x4CB6D8EED3E87138
# 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/pull-ui-20170220-1:
egl-helpers: Support newer MESA versions
spice: allow to specify drm rendernode
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/egl-helpers.h | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h index 03fcf4bba2..88a13e827b 100644 --- a/include/ui/egl-helpers.h +++ b/include/ui/egl-helpers.h @@ -14,8 +14,7 @@ extern int qemu_egl_rn_fd; extern struct gbm_device *qemu_egl_rn_gbm_dev; extern EGLContext qemu_egl_rn_ctx; -int qemu_egl_rendernode_open(void); -int egl_rendernode_init(void); +int egl_rendernode_init(const char *rendernode); int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc); #endif |