Commit 9b9fbe8a authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-ui-20170227-1' into staging 



gtk: fix kbd on xwayland
vnc: fix double free issues
opengl improvements

# gpg: Signature made Mon 27 Feb 2017 16:11:30 GMT
# gpg:                using RSA key 0x4CB6D8EED3E87138
# gpg: Good signature from "Gerd Hoffmann (work) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"
# Primary key fingerprint: A032 8CFF B93A 17A7 9901  FE7D 4CB6 D8EE D3E8 7138

* remotes/kraxel/tags/pull-ui-20170227-1:
  vnc: fix double free issues
  spice: add display & head options
  ui: Use XkbGetMap and XkbGetNames instead of XkbGetKeyboard
  gtk-egl: add scanout_disable support
  sdl2: add scanout_disable support
  spice: add scanout_disable support
  virtio-gpu: use dpy_gl_scanout_disable
  console: add dpy_gl_scanout_disable
  console: rename dpy_gl_scanout to dpy_gl_scanout_texture

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 8f2d7c34 2dc120be

hw/display/virtio-gpu-3d.c

+6 −7
Original line number Diff line number Diff line
@@ -177,7 +177,7 @@ static void virgl_cmd_set_scanout(VirtIOGPU *g, 
        qemu_console_resize(g->scanout[ss.scanout_id].con,

                            ss.r.width, ss.r.height);

        virgl_renderer_force_ctx_0();

        dpy_gl_scanout(g->scanout[ss.scanout_id].con, info.tex_id,

        dpy_gl_scanout_texture(g->scanout[ss.scanout_id].con, info.tex_id,

                               info.flags & 1 /* FIXME: Y_0_TOP */,

                               info.width, info.height,

                               ss.r.x, ss.r.y, ss.r.width, ss.r.height);
@@ -185,8 +185,7 @@ static void virgl_cmd_set_scanout(VirtIOGPU *g, 
        if (ss.scanout_id != 0) {

            dpy_gfx_replace_surface(g->scanout[ss.scanout_id].con, NULL);

        }

        dpy_gl_scanout(g->scanout[ss.scanout_id].con, 0, false,

                       0, 0, 0, 0, 0, 0);

        dpy_gl_scanout_disable(g->scanout[ss.scanout_id].con);

    }

    g->scanout[ss.scanout_id].resource_id = ss.resource_id;

}
@@ -597,7 +596,7 @@ void virtio_gpu_virgl_reset(VirtIOGPU *g) 
        if (i != 0) {

            dpy_gfx_replace_surface(g->scanout[i].con, NULL);

        }

        dpy_gl_scanout(g->scanout[i].con, 0, false, 0, 0, 0, 0, 0, 0);

        dpy_gl_scanout_disable(g->scanout[i].con);

    }

}

include/ui/console.h

+13 −8
Original line number Diff line number Diff line
@@ -215,10 +215,14 @@ typedef struct DisplayChangeListenerOps { 
                                   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 backing_width, uint32_t backing_height,

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

    void (*dpy_gl_scanout_disable)(DisplayChangeListener *dcl);

    void (*dpy_gl_scanout_texture)(DisplayChangeListener *dcl,

                                   uint32_t backing_id,

                                   bool backing_y_0_top,

                                   uint32_t backing_width,

                                   uint32_t backing_height,

                                   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);
@@ -284,7 +288,8 @@ 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,

void dpy_gl_scanout_disable(QemuConsole *con);

void dpy_gl_scanout_texture(QemuConsole *con,

                            uint32_t backing_id, bool backing_y_0_top,

                            uint32_t backing_width, uint32_t backing_height,

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

include/ui/gtk.h

+15 −10
Original line number Diff line number Diff line
@@ -103,9 +103,12 @@ void gd_egl_switch(DisplayChangeListener *dcl, 
                   DisplaySurface *surface);

QEMUGLContext gd_egl_create_context(DisplayChangeListener *dcl,

                                    QEMUGLParams *params);

void gd_egl_scanout(DisplayChangeListener *dcl,

                    uint32_t backing_id, bool backing_y_0_top,

                    uint32_t backing_width, uint32_t backing_height,

void gd_egl_scanout_disable(DisplayChangeListener *dcl);

void gd_egl_scanout_texture(DisplayChangeListener *dcl,

                            uint32_t backing_id,

                            bool backing_y_0_top,

                            uint32_t backing_width,

                            uint32_t backing_height,

                            uint32_t x, uint32_t y,

                            uint32_t w, uint32_t h);

void gd_egl_scanout_flush(DisplayChangeListener *dcl,
@@ -126,9 +129,11 @@ QEMUGLContext gd_gl_area_create_context(DisplayChangeListener *dcl, 
                                        QEMUGLParams *params);

void gd_gl_area_destroy_context(DisplayChangeListener *dcl,

                                QEMUGLContext ctx);

void gd_gl_area_scanout(DisplayChangeListener *dcl,

                        uint32_t backing_id, bool backing_y_0_top,

                        uint32_t backing_width, uint32_t backing_height,

void gd_gl_area_scanout_texture(DisplayChangeListener *dcl,

                                uint32_t backing_id,

                                bool backing_y_0_top,

                                uint32_t backing_width,

                                uint32_t backing_height,

                                uint32_t x, uint32_t y,

                                uint32_t w, uint32_t h);

void gd_gl_area_scanout_flush(DisplayChangeListener *dcl,

include/ui/sdl2.h

+8 −5
Original line number Diff line number Diff line
@@ -62,9 +62,12 @@ int sdl2_gl_make_context_current(DisplayChangeListener *dcl, 
                                 QEMUGLContext ctx);

QEMUGLContext sdl2_gl_get_current_context(DisplayChangeListener *dcl);



void sdl2_gl_scanout(DisplayChangeListener *dcl,

                     uint32_t backing_id, bool backing_y_0_top,

                     uint32_t backing_width, uint32_t backing_height,

void sdl2_gl_scanout_disable(DisplayChangeListener *dcl);

void sdl2_gl_scanout_texture(DisplayChangeListener *dcl,

                             uint32_t backing_id,

                             bool backing_y_0_top,

                             uint32_t backing_width,

                             uint32_t backing_height,

                             uint32_t x, uint32_t y,

                             uint32_t w, uint32_t h);

void sdl2_gl_scanout_flush(DisplayChangeListener *dcl,

ui/console.c

+22 −8
Original line number Diff line number Diff line
@@ -1735,13 +1735,27 @@ QEMUGLContext dpy_gl_ctx_get_current(QemuConsole *con) 
    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 backing_width, uint32_t backing_height,

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

void dpy_gl_scanout_disable(QemuConsole *con)

{

    assert(con->gl);

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

    if (con->gl->ops->dpy_gl_scanout_disable) {

        con->gl->ops->dpy_gl_scanout_disable(con->gl);

    } else {

        con->gl->ops->dpy_gl_scanout_texture(con->gl, 0, false, 0, 0,

                                             0, 0, 0, 0);

    }

}



void dpy_gl_scanout_texture(QemuConsole *con,

                            uint32_t backing_id,

                            bool backing_y_0_top,

                            uint32_t backing_width,

                            uint32_t backing_height,

                            uint32_t x, uint32_t y,

                            uint32_t width, uint32_t height)

{

    assert(con->gl);

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

                                         backing_y_0_top,

                                         backing_width, backing_height,

                                         x, y, width, height);