[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PULL 4/5] egl-helpers: add modifier support to egl_get_fd_
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PULL 4/5] egl-helpers: add modifier support to egl_get_fd_for_texture(). |
Date: |
Fri, 7 Jun 2019 15:19:00 +0200 |
Add modifier parameter to egl_get_fd_for_texture(), to return the used
modifier on dmabuf exports.
Signed-off-by: Gerd Hoffmann <address@hidden>
Message-id: address@hidden
---
include/ui/egl-helpers.h | 3 ++-
ui/egl-helpers.c | 5 +++--
ui/spice-display.c | 7 ++++---
3 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/include/ui/egl-helpers.h b/include/ui/egl-helpers.h
index b976cb872821..d71412779913 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);
diff --git a/ui/egl-helpers.c b/ui/egl-helpers.c
index e90eef8c9c3a..0c9716067cfb 100644
--- a/ui/egl-helpers.c
+++ b/ui/egl-helpers.c
@@ -200,7 +200,8 @@ err:
return -1;
}
-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)
{
EGLImageKHR image;
EGLint num_planes, fd;
@@ -214,7 +215,7 @@ int egl_get_fd_for_texture(uint32_t tex_id, EGLint *stride,
EGLint *fourcc)
}
eglExportDMABUFImageQueryMESA(qemu_egl_display, image, fourcc,
- &num_planes, NULL);
+ &num_planes, modifier);
if (num_planes != 1) {
eglDestroyImageKHR(qemu_egl_display, image);
return -1;
diff --git a/ui/spice-display.c b/ui/spice-display.c
index a5e26479a866..104df2302575 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -888,7 +888,8 @@ static void spice_gl_switch(DisplayChangeListener *dcl,
if (ssd->ds) {
surface_gl_create_texture(ssd->gls, ssd->ds);
fd = egl_get_fd_for_texture(ssd->ds->texture,
- &stride, &fourcc);
+ &stride, &fourcc,
+ NULL);
if (fd < 0) {
surface_gl_destroy_texture(ssd->gls, ssd->ds);
return;
@@ -945,7 +946,7 @@ static void
qemu_spice_gl_scanout_texture(DisplayChangeListener *dcl,
int fd = -1;
assert(tex_id);
- fd = egl_get_fd_for_texture(tex_id, &stride, &fourcc);
+ fd = egl_get_fd_for_texture(tex_id, &stride, &fourcc, NULL);
if (fd < 0) {
fprintf(stderr, "%s: failed to get fd for texture\n", __func__);
return;
@@ -1063,7 +1064,7 @@ static void qemu_spice_gl_update(DisplayChangeListener
*dcl,
egl_fb_setup_new_tex(&ssd->blit_fb,
dmabuf->width, dmabuf->height);
fd = egl_get_fd_for_texture(ssd->blit_fb.texture,
- &stride, &fourcc);
+ &stride, &fourcc, NULL);
spice_qxl_gl_scanout(&ssd->qxl, fd,
dmabuf->width, dmabuf->height,
stride, fourcc, false);
--
2.18.1
- [Qemu-devel] [PULL 0/5] Ui 20190607 patches, Gerd Hoffmann, 2019/06/07
- [Qemu-devel] [PULL 4/5] egl-helpers: add modifier support to egl_get_fd_for_texture().,
Gerd Hoffmann <=
- [Qemu-devel] [PULL 3/5] vfio/display: set dmabuf modifier field, Gerd Hoffmann, 2019/06/07
- [Qemu-devel] [PULL 1/5] ui/curses: Fix build with -m32, Gerd Hoffmann, 2019/06/07
- [Qemu-devel] [PULL 2/5] console: add dmabuf modifier field., Gerd Hoffmann, 2019/06/07
- [Qemu-devel] [PULL 5/5] egl-helpers: add modifier support to egl_dmabuf_import_texture(), Gerd Hoffmann, 2019/06/07
- Re: [Qemu-devel] [PULL 0/5] Ui 20190607 patches, Peter Maydell, 2019/06/07