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

console/opengl: split up dpy_gl_cursor ops

Browse Source 
Split the cursor callback into two, one for setting the dmabuf,
one for setting the position.  Also add hotspot information.

Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
Message-id: 20180220110433.20353-2-kraxel@redhat.com
This commit is contained in:
Gerd Hoffmann 2018-02-20 12:04:31 +01:00
parent afb92eb985
commit 6e1f2cb560
3 changed files with 34 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
include/ui/console.h
View File

@ -230,8 +230,10 @@ typedef struct DisplayChangeListenerOps {
void (*dpy_gl_scanout_dmabuf)(DisplayChangeListener *dcl, void (*dpy_gl_scanout_dmabuf)(DisplayChangeListener *dcl,
QemuDmaBuf *dmabuf); QemuDmaBuf *dmabuf);
void (*dpy_gl_cursor_dmabuf)(DisplayChangeListener *dcl, void (*dpy_gl_cursor_dmabuf)(DisplayChangeListener *dcl,
QemuDmaBuf *dmabuf, QemuDmaBuf *dmabuf, bool have_hot,
uint32_t pos_x, uint32_t pos_y); 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, void (*dpy_gl_release_dmabuf)(DisplayChangeListener *dcl,
QemuDmaBuf *dmabuf); QemuDmaBuf *dmabuf);
void (*dpy_gl_update)(DisplayChangeListener *dcl, 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); uint32_t x, uint32_t y, uint32_t w, uint32_t h);
void dpy_gl_scanout_dmabuf(QemuConsole *con, void dpy_gl_scanout_dmabuf(QemuConsole *con,
QemuDmaBuf *dmabuf); QemuDmaBuf *dmabuf);
void dpy_gl_cursor_dmabuf(QemuConsole *con, void dpy_gl_cursor_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf,
QemuDmaBuf *dmabuf, bool have_hot, uint32_t hot_x, uint32_t hot_y);
uint32_t pos_x, uint32_t pos_y); void dpy_gl_cursor_position(QemuConsole *con,
uint32_t pos_x, uint32_t pos_y);
void dpy_gl_release_dmabuf(QemuConsole *con, void dpy_gl_release_dmabuf(QemuConsole *con,
QemuDmaBuf *dmabuf); QemuDmaBuf *dmabuf);
void dpy_gl_update(QemuConsole *con, void dpy_gl_update(QemuConsole *con,

18
ui/console.c
View File

@ -1760,14 +1760,24 @@ void dpy_gl_scanout_dmabuf(QemuConsole *con,
con->gl->ops->dpy_gl_scanout_dmabuf(con->gl, dmabuf); con->gl->ops->dpy_gl_scanout_dmabuf(con->gl, dmabuf);
} }
void dpy_gl_cursor_dmabuf(QemuConsole *con, void dpy_gl_cursor_dmabuf(QemuConsole *con, QemuDmaBuf *dmabuf,
QemuDmaBuf *dmabuf, bool have_hot, uint32_t hot_x, uint32_t hot_y)
uint32_t pos_x, uint32_t pos_y)
{ {
assert(con->gl); assert(con->gl);
if (con->gl->ops->dpy_gl_cursor_dmabuf) { 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);
} }
} }

17
ui/egl-headless.c
View File

@ -84,14 +84,11 @@ static void egl_scanout_dmabuf(DisplayChangeListener *dcl,
} }
static void egl_cursor_dmabuf(DisplayChangeListener *dcl, static void egl_cursor_dmabuf(DisplayChangeListener *dcl,
QemuDmaBuf *dmabuf, QemuDmaBuf *dmabuf, bool have_hot,
uint32_t pos_x, uint32_t pos_y) uint32_t hot_x, uint32_t hot_y)
{ {
egl_dpy *edpy = container_of(dcl, egl_dpy, dcl); egl_dpy *edpy = container_of(dcl, egl_dpy, dcl);
edpy->pos_x = pos_x;
edpy->pos_y = pos_y;
egl_dmabuf_import_texture(dmabuf); egl_dmabuf_import_texture(dmabuf);
if (!dmabuf->texture) { if (!dmabuf->texture) {
return; return;
@ -101,6 +98,15 @@ static void egl_cursor_dmabuf(DisplayChangeListener *dcl,
dmabuf->texture, false); 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, static void egl_release_dmabuf(DisplayChangeListener *dcl,
QemuDmaBuf *dmabuf) QemuDmaBuf *dmabuf)
{ {
@ -150,6 +156,7 @@ static const DisplayChangeListenerOps egl_ops = {
.dpy_gl_scanout_texture = egl_scanout_texture, .dpy_gl_scanout_texture = egl_scanout_texture,
.dpy_gl_scanout_dmabuf = egl_scanout_dmabuf, .dpy_gl_scanout_dmabuf = egl_scanout_dmabuf,
.dpy_gl_cursor_dmabuf = egl_cursor_dmabuf, .dpy_gl_cursor_dmabuf = egl_cursor_dmabuf,
.dpy_gl_cursor_position = egl_cursor_position,
.dpy_gl_release_dmabuf = egl_release_dmabuf, .dpy_gl_release_dmabuf = egl_release_dmabuf,
.dpy_gl_update = egl_scanout_flush, .dpy_gl_update = egl_scanout_flush,
}; };