diff options
| author | Peter Maydell | 2016-02-23 17:14:17 +0100 |
|---|---|---|
| committer | Peter Maydell | 2016-02-23 17:14:17 +0100 |
| commit | 1b1624092d1f1f746adea6e1237a07f6788c2e3d (patch) | |
| tree | 3dab4aad5542d376ee78ecfb79c14df12d9a7123 /include/ui/egl-helpers.h | |
| parent | tracetool: Include osdep.h in generated-ust.c (diff) | |
| parent | Postcopy+spice: Pass spice migration data earlier (diff) | |
| download | qemu-1b1624092d1f1f746adea6e1237a07f6788c2e3d.tar.gz qemu-1b1624092d1f1f746adea6e1237a07f6788c2e3d.tar.xz qemu-1b1624092d1f1f746adea6e1237a07f6788c2e3d.zip | |
Merge remote-tracking branch 'remotes/spice/tags/pull-spice-20160223-1' into staging
spice: initial opengl/virgl support, postcopy migration fix.
# gpg: Signature made Tue 23 Feb 2016 12:30:40 GMT using RSA key ID D3E87138
# 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>"
* remotes/spice/tags/pull-spice-20160223-1:
Postcopy+spice: Pass spice migration data earlier
spice/gl: tweak debug messages.
spice/gl: add unblock timer
spice: add opengl/virgl/dmabuf support
spice: reset cursor on resize
egl-helpers: add functions for render nodes and dma-buf passing
configure: add dma-buf support detection.
spice: init dcl before registering qxl interface
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include/ui/egl-helpers.h')
| -rw-r--r-- | include/ui/egl-helpers.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h index 8c84398001..03fcf4bba2 100644 --- a/include/ui/egl-helpers.h +++ b/include/ui/egl-helpers.h @@ -3,10 +3,23 @@ #include <epoxy/gl.h> #include <epoxy/egl.h> +#include <gbm.h> extern EGLDisplay *qemu_egl_display; extern EGLConfig qemu_egl_config; +#ifdef CONFIG_OPENGL_DMABUF + +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_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc); + +#endif + EGLSurface qemu_egl_init_surface_x11(EGLContext ectx, Window win); int qemu_egl_init_dpy(EGLNativeDisplayType dpy, bool gles, bool debug); |