diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2019-06-07 14:53:00 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2019-06-07 14:53:00 +0100 |
| commit | 9021fcfb883a17908a74a0ba1c09ff3b1bf97ebb (patch) | |
| tree | 47129c300bbb3950f5cc7566770e82560072faee /include | |
| parent | 33556237f652d8a712d0b6d29ecb442e6b65fe42 (diff) | |
| parent | 15ee0d9bc10b3de677ff6cd78b6dc9d5a7d40603 (diff) | |
| download | qemu-9021fcfb883a17908a74a0ba1c09ff3b1bf97ebb.zip qemu-9021fcfb883a17908a74a0ba1c09ff3b1bf97ebb.tar.gz qemu-9021fcfb883a17908a74a0ba1c09ff3b1bf97ebb.tar.bz2 | |
Merge remote-tracking branch 'remotes/kraxel/tags/ui-20190607-pull-request' into staging
curses: 32bit build fix.
egl: dmabuf modifier support.
# gpg: Signature made Fri 07 Jun 2019 14:18:41 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-20190607-pull-request:
egl-helpers: add modifier support to egl_dmabuf_import_texture()
egl-helpers: add modifier support to egl_get_fd_for_texture().
vfio/display: set dmabuf modifier field
console: add dmabuf modifier field.
ui/curses: Fix build with -m32
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/ui/console.h | 1 | ||||
| -rw-r--r-- | include/ui/egl-helpers.h | 3 |
2 files changed, 3 insertions, 1 deletions
diff --git a/include/ui/console.h b/include/ui/console.h index fef900d..f981696 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -175,6 +175,7 @@ typedef struct QemuDmaBuf { uint32_t height; uint32_t stride; uint32_t fourcc; + uint64_t modifier; uint32_t texture; bool y0_top; } QemuDmaBuf; diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h index b976cb8..d714127 100644 --- a/include/ui/egl-helpers.h +++ b/include/ui/egl-helpers.h @@ -36,7 +36,8 @@ extern struct gbm_device *qemu_egl_rn_gbm_dev; extern EGLContext qemu_egl_rn_ctx; int egl_rendernode_init(const char *rendernode, DisplayGLMode mode); -int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc); +int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride, EGLint *fourcc, + EGLuint64KHR *modifier); void egl_dmabuf_import_texture(QemuDmaBuf *dmabuf); void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf); |