opengl: some dmabuf support updates
cover opengl: some dmabuf support updates
This series updates the UI interface for dmabug cursors. Splits the callback into two, so we have a separate call for cursor moves. Also adds hotspot information. Series also includes two small fixes in egl code.
Gerd Hoffmann (3):
console/opengl: split up dpy_gl_cursor ops
egl-headless: cursor_dmabuf: handle NULL cursor
egl-helpers: add alpha channel to texture format
include/ui/console.h | 13 ++++++++----- ui/console.c | 18 ++++++++++++++---- ui/egl-headless.c | 30 ++++++++++++++++++++---------- ui/egl-helpers.c | 2 +- 4 files changed, 43 insertions(+), 20 deletions(-)
Signature · 1 line
2.9.3
PATCH 1/3 console/opengl: split up dpy_gl_cursor ops
Split the cursor callback into two, one for setting the dmabuf, one for setting the position. Also add hotspot information.
--- include/ui/console.h | 13 ++++++++----- ui/console.c | 18 ++++++++++++++---- ui/egl-headless.c | 17 ++++++++++++----- 3 files changed, 34 insertions(+), 14 deletions(-)
include/ui/console.h +8 -5
@@ -230,8 +230,10 @@ typedef struct DisplayChangeListenerOps {void (*dpy_gl_scanout_dmabuf)(DisplayChangeListener *dcl,QemuDmaBuf *dmabuf);void (*dpy_gl_cursor_dmabuf)(DisplayChangeListener *dcl, -QemuDmaBuf *dmabuf, -uint32_t pos_x,uint32_t pos_y); +QemuDmaBuf *dmabuf,bool have_hot, +uint32_t hot_x,uint32_t hot_y); +void (*dpy_gl_cursor_position)(DisplayChangeListener *dcl, +uint32_t pos_x,uint32_t pos_y);void (*dpy_gl_release_dmabuf)(DisplayChangeListener *dcl,QemuDmaBuf *dmabuf); void (*dpy_gl_update)(DisplayChangeListener *dcl,
@@ -304,9 +306,10 @@ void dpy_gl_scanout_texture(QemuConsole *con, uint32_t x, uint32_t y, uint32_t w, uint32_t h);void dpy_gl_scanout_dmabuf (QemuConsole *con,QemuDmaBuf *dmabuf); -void dpy_gl_cursor_dmabuf (QemuConsole *con, -QemuDmaBuf *dmabuf, -uint32_t pos_x,uint32_t pos_y); +void dpy_gl_cursor_dmabuf (QemuConsole *con,QemuDmaBuf *dmabuf, +bool have_hot,uint32_t hot_x,uint32_t hot_y); +void dpy_gl_cursor_position (QemuConsole *con, +uint32_t pos_x,uint32_t pos_y);void dpy_gl_release_dmabuf (QemuConsole *con,QemuDmaBuf *dmabuf); void dpy_gl_update(QemuConsole *con,
ui/console.c +14 -4
@@ -1760,14 +1760,24 @@ void dpy_gl_scanout_dmabuf(QemuConsole *con, con->gl->ops->dpy_gl_scanout_dmabuf (con->gl, dmabuf); } -void dpy_gl_cursor_dmabuf (QemuConsole *con, -QemuDmaBuf *dmabuf, -uint32_t pos_x,uint32_t pos_y) +void dpy_gl_cursor_dmabuf (QemuConsole *con,QemuDmaBuf *dmabuf, +bool have_hot,uint32_t hot_x,uint32_t hot_y) {assert (con->gl);if (con->gl->ops->dpy_gl_cursor_dmabuf) { - con->gl->ops->dpy_gl_cursor_dmabuf (con->gl, dmabuf, pos_x, pos_y); + con->gl->ops->dpy_gl_cursor_dmabuf (con->gl, dmabuf, + have_hot, hot_x, hot_y); + } +} + +void dpy_gl_cursor_position (QemuConsole *con, +uint32_t pos_x,uint32_t pos_y) +{ +assert (con->gl); + +if (con->gl->ops->dpy_gl_cursor_position) { + con->gl->ops->dpy_gl_cursor_position (con->gl, pos_x, pos_y); } }
ui/egl-headless.c +12 -5
@@ -84,14 +84,11 @@ static void egl_scanout_dmabuf(DisplayChangeListener *dcl, }static void egl_cursor_dmabuf (DisplayChangeListener *dcl, -QemuDmaBuf *dmabuf, -uint32_t pos_x,uint32_t pos_y) +QemuDmaBuf *dmabuf,bool have_hot, +uint32_t hot_x,uint32_t hot_y) {egl_dpy *edpy =container_of (dcl, egl_dpy, dcl); - edpy->pos_x = pos_x; - edpy->pos_y = pos_y; -egl_dmabuf_import_texture (dmabuf);if (!dmabuf->texture) {return ;
@@ -101,6 +98,15 @@ static void egl_cursor_dmabuf(DisplayChangeListener *dcl, dmabuf->texture, false); } +static void egl_cursor_position (DisplayChangeListener *dcl, +uint32_t pos_x,uint32_t pos_y) +{ +egl_dpy *edpy =container_of (dcl, egl_dpy, dcl); + + edpy->pos_x = pos_x; + edpy->pos_y = pos_y; +} +static void egl_release_dmabuf (DisplayChangeListener *dcl,QemuDmaBuf *dmabuf) {
@@ -150,6 +156,7 @@ static const DisplayChangeListenerOps egl_ops = { .dpy_gl_scanout_texture = egl_scanout_texture, .dpy_gl_scanout_dmabuf = egl_scanout_dmabuf, .dpy_gl_cursor_dmabuf = egl_cursor_dmabuf, + .dpy_gl_cursor_position = egl_cursor_position, .dpy_gl_release_dmabuf = egl_release_dmabuf, .dpy_gl_update = egl_scanout_flush, };
Signature · 1 line
2.9.3
PATCH 2/3 egl-headless: cursor_dmabuf: handle NULL cursor
In reply to Gerd HoffmannThe cursor dmabuf can be NULL, in case no cursor defined by the guest. Happens for example when linux guests show the framebuffer console.
--- ui/egl-headless.c | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-)
ui/egl-headless.c +9 -6
@@ -89,13 +89,16 @@ static void egl_cursor_dmabuf(DisplayChangeListener *dcl, {egl_dpy *edpy =container_of (dcl, egl_dpy, dcl); -egl_dmabuf_import_texture (dmabuf); -if (!dmabuf->texture) { -return ; +if (dmabuf) { +egl_dmabuf_import_texture (dmabuf); +if (!dmabuf->texture) { +return ; + } +egl_fb_setup_for_tex (&edpy->cursor_fb, dmabuf->width, dmabuf->height, + dmabuf->texture, false); + }else { +egl_fb_destroy (&edpy->cursor_fb); } - -egl_fb_setup_for_tex (&edpy->cursor_fb, dmabuf->width, dmabuf->height, - dmabuf->texture, false); } static void egl_cursor_position(DisplayChangeListener *dcl,
Signature · 1 line
2.9.3
PATCH 3/3 egl-helpers: add alpha channel to texture format
In reply to Gerd HoffmannNeeded when rendering cursers which (unlike framebuffers) actually are transparent.
--- ui/egl-helpers.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
ui/egl-helpers.c +1 -1
@@ -83,7 +83,7 @@ void egl_fb_setup_new_tex(egl_fb *fb, int width, int height)glGenTextures (1 , &texture);glBindTexture (GL_TEXTURE_2D , texture); -glTexImage2D (GL_TEXTURE_2D ,0 ,GL_RGB , width, height, +glTexImage2D (GL_TEXTURE_2D ,0 ,GL_RGBA , width, height,0 ,GL_BGRA ,GL_UNSIGNED_BYTE ,0 );egl_fb_setup_for_tex (fb, width, height, texture, true);
Signature · 1 line
2.9.3