Commit 06020b95 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

ui/console: add opengl context and scanout support interfaces. 



Add callbacks for opengl context management and scanout texture
configuration to DisplayChangeListenerOps.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Reviewed-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
parent 136a8d9d

include/ui/console.h

+37 −0
Original line number Diff line number Diff line
@@ -157,6 +157,14 @@ void cursor_set_mono(QEMUCursor *c, 
void cursor_get_mono_image(QEMUCursor *c, int foreground, uint8_t *mask);

void cursor_get_mono_mask(QEMUCursor *c, int transparent, uint8_t *mask);



typedef void *QEMUGLContext;

typedef struct QEMUGLParams QEMUGLParams;



struct QEMUGLParams {

    int major_ver;

    int minor_ver;

};



typedef struct DisplayChangeListenerOps {

    const char *dpy_name;
@@ -183,6 +191,21 @@ typedef struct DisplayChangeListenerOps { 
                          int x, int y, int on);

    void (*dpy_cursor_define)(DisplayChangeListener *dcl,

                              QEMUCursor *cursor);



    QEMUGLContext (*dpy_gl_ctx_create)(DisplayChangeListener *dcl,

                                       QEMUGLParams *params);

    void (*dpy_gl_ctx_destroy)(DisplayChangeListener *dcl,

                               QEMUGLContext ctx);

    int (*dpy_gl_ctx_make_current)(DisplayChangeListener *dcl,

                                   QEMUGLContext ctx);

    QEMUGLContext (*dpy_gl_ctx_get_current)(DisplayChangeListener *dcl);



    void (*dpy_gl_scanout)(DisplayChangeListener *dcl,

                           uint32_t backing_id, bool backing_y_0_top,

                           uint32_t x, uint32_t y, uint32_t w, uint32_t h);

    void (*dpy_gl_update)(DisplayChangeListener *dcl,

                          uint32_t x, uint32_t y, uint32_t w, uint32_t h);



} DisplayChangeListenerOps;



struct DisplayChangeListener {
@@ -244,6 +267,20 @@ bool dpy_cursor_define_supported(QemuConsole *con); 
bool dpy_gfx_check_format(QemuConsole *con,

                          pixman_format_code_t format);



void dpy_gl_scanout(QemuConsole *con,

                    uint32_t backing_id, bool backing_y_0_top,

                    uint32_t x, uint32_t y, uint32_t w, uint32_t h);

void dpy_gl_update(QemuConsole *con,

                   uint32_t x, uint32_t y, uint32_t w, uint32_t h);



QEMUGLContext dpy_gl_ctx_create(QemuConsole *con,

                                QEMUGLParams *params);

void dpy_gl_ctx_destroy(QemuConsole *con, QEMUGLContext ctx);

int dpy_gl_ctx_make_current(QemuConsole *con, QEMUGLContext ctx);

QEMUGLContext dpy_gl_ctx_get_current(QemuConsole *con);



bool console_has_gl(QemuConsole *con);



static inline int surface_stride(DisplaySurface *s)

{

    return pixman_image_get_stride(s->image);

ui/console.c

+65 −2
Original line number Diff line number Diff line
@@ -121,6 +121,7 @@ struct QemuConsole { 
    DisplayState *ds;

    DisplaySurface *surface;

    int dcls;

    DisplayChangeListener *gl;



    /* Graphic console state.  */

    Object *device;
@@ -1332,6 +1333,11 @@ void qemu_free_displaysurface(DisplaySurface *surface) 
    g_free(surface);

}



bool console_has_gl(QemuConsole *con)

{

    return con->gl != NULL;

}



void register_displaychangelistener(DisplayChangeListener *dcl)

{

    static const char nodev[] =
@@ -1339,6 +1345,17 @@ void register_displaychangelistener(DisplayChangeListener *dcl) 
    static DisplaySurface *dummy;

    QemuConsole *con;



    if (dcl->ops->dpy_gl_ctx_create) {

        /* display has opengl support */

        assert(dcl->con);

        if (dcl->con->gl) {

            fprintf(stderr, "can't register two opengl displays (%s, %s)\n",

                    dcl->ops->dpy_name, dcl->con->gl->ops->dpy_name);

            exit(1);

        }

        dcl->con->gl = dcl;

    }



    trace_displaychangelistener_register(dcl, dcl->ops->dpy_name);

    dcl->ds = get_alloc_displaystate();

    QLIST_INSERT_HEAD(&dcl->ds->listeners, dcl, next);
@@ -1417,9 +1434,13 @@ void dpy_gfx_update(QemuConsole *con, int x, int y, int w, int h) 
{

    DisplayState *s = con->ds;

    DisplayChangeListener *dcl;

    int width = surface_width(con->surface);

    int height = surface_height(con->surface);

    int width = w;

    int height = h;



    if (con->surface) {

        width = surface_width(con->surface);

        height = surface_height(con->surface);

    }

    x = MAX(x, 0);

    y = MAX(y, 0);

    x = MIN(x, width);
@@ -1619,6 +1640,48 @@ bool dpy_cursor_define_supported(QemuConsole *con) 
    return false;

}



QEMUGLContext dpy_gl_ctx_create(QemuConsole *con,

                                struct QEMUGLParams *qparams)

{

    assert(con->gl);

    return con->gl->ops->dpy_gl_ctx_create(con->gl, qparams);

}



void dpy_gl_ctx_destroy(QemuConsole *con, QEMUGLContext ctx)

{

    assert(con->gl);

    con->gl->ops->dpy_gl_ctx_destroy(con->gl, ctx);

}



int dpy_gl_ctx_make_current(QemuConsole *con, QEMUGLContext ctx)

{

    assert(con->gl);

    return con->gl->ops->dpy_gl_ctx_make_current(con->gl, ctx);

}



QEMUGLContext dpy_gl_ctx_get_current(QemuConsole *con)

{

    assert(con->gl);

    return con->gl->ops->dpy_gl_ctx_get_current(con->gl);

}



void dpy_gl_scanout(QemuConsole *con,

                    uint32_t backing_id, bool backing_y_0_top,

                    uint32_t x, uint32_t y, uint32_t width, uint32_t height)

{

    assert(con->gl);

    con->gl->ops->dpy_gl_scanout(con->gl, backing_id,

                                 backing_y_0_top,

                                 x, y, width, height);

}



void dpy_gl_update(QemuConsole *con,

                   uint32_t x, uint32_t y, uint32_t w, uint32_t h)

{

    assert(con->gl);

    con->gl->ops->dpy_gl_update(con->gl, x, y, w, h);

}



/***********************************************************/

/* register display */