mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

egl-helpers: add modifier support to egl_get_fd_for_texture().

Browse Source 
Add modifier parameter to egl_get_fd_for_texture(), to return the used
modifier on dmabuf exports.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20190529072144.26737-4-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2019-05-29 09:21:43 +02:00
parent a6c9d5da08
commit 5fc1fb62af
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/ui/egl-helpers.h
View File

@ -36,7 +36,8 @@ extern struct gbm_device *qemu_egl_rn_gbm_dev;
extern EGLContext qemu_egl_rn_ctx; extern EGLContext qemu_egl_rn_ctx;
int egl_rendernode_init(const char *rendernode, DisplayGLMode mode); 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_import_texture(QemuDmaBuf *dmabuf);
void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf); void egl_dmabuf_release_texture(QemuDmaBuf *dmabuf);

5
ui/egl-helpers.c
View File

@ -200,7 +200,8 @@ err:
return -1; 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; EGLImageKHR image;
EGLint num_planes, fd; 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, eglExportDMABUFImageQueryMESA(qemu_egl_display, image, fourcc,
&num_planes, NULL); &num_planes, modifier);
if (num_planes != 1) { if (num_planes != 1) {
eglDestroyImageKHR(qemu_egl_display, image); eglDestroyImageKHR(qemu_egl_display, image);
return -1; return -1;

7
ui/spice-display.c
View File

@ -888,7 +888,8 @@ static void spice_gl_switch(DisplayChangeListener *dcl,
if (ssd->ds) { if (ssd->ds) {
surface_gl_create_texture(ssd->gls, ssd->ds); surface_gl_create_texture(ssd->gls, ssd->ds);
fd = egl_get_fd_for_texture(ssd->ds->texture, fd = egl_get_fd_for_texture(ssd->ds->texture,
&stride, &fourcc); &stride, &fourcc,
NULL);
if (fd < 0) { if (fd < 0) {
surface_gl_destroy_texture(ssd->gls, ssd->ds); surface_gl_destroy_texture(ssd->gls, ssd->ds);
return; return;
@ -945,7 +946,7 @@ static void qemu_spice_gl_scanout_texture(DisplayChangeListener *dcl,
int fd = -1; int fd = -1;
assert(tex_id); 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) { if (fd < 0) {
fprintf(stderr, "%s: failed to get fd for texture\n", __func__); fprintf(stderr, "%s: failed to get fd for texture\n", __func__);
return; return;
@ -1063,7 +1064,7 @@ static void qemu_spice_gl_update(DisplayChangeListener *dcl,
egl_fb_setup_new_tex(&ssd->blit_fb, egl_fb_setup_new_tex(&ssd->blit_fb,
dmabuf->width, dmabuf->height); dmabuf->width, dmabuf->height);
fd = egl_get_fd_for_texture(ssd->blit_fb.texture, fd = egl_get_fd_for_texture(ssd->blit_fb.texture,
&stride, &fourcc); &stride, &fourcc, NULL);
spice_qxl_gl_scanout(&ssd->qxl, fd, spice_qxl_gl_scanout(&ssd->qxl, fd,
dmabuf->width, dmabuf->height, dmabuf->width, dmabuf->height,
stride, fourcc, false); stride, fourcc, false);