Commit 9d8256eb authored by Marc-André Lureau's avatar Marc-André Lureau Committed by Gerd Hoffmann
Browse files

virgl: pass whole GL scanout dimensions 



Spice client needs the whole GL texture dimension to be able to show a
scanout with a monitor offset (different than +0+0).

Furthermore, this fixes a crash when calling surface_{width,height}()
after dpy_gfx_replace_surface(con, NULL) was called in
virgl_cmd_set_scanout()

Signed-off-by: default avatarMarc-André Lureau <marcandre.lureau@redhat.com>
Message-id: 1465911849-30423-4-git-send-email-marcandre.lureau@redhat.com
Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent c61d8126

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

+3 −2
Original line number Diff line number Diff line
@@ -171,13 +171,14 @@ static void virgl_cmd_set_scanout(VirtIOGPU *g, 
        virgl_renderer_force_ctx_0();

        dpy_gl_scanout(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);

    } else {

        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, 0, 0, 0, 0);

    }

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

}
@@ -580,7 +581,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);

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

    }

}

include/ui/console.h

+2 −0
Original line number Diff line number Diff line
@@ -217,6 +217,7 @@ typedef struct DisplayChangeListenerOps { 


    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_update)(DisplayChangeListener *dcl,

                          uint32_t x, uint32_t y, uint32_t w, uint32_t h);
@@ -285,6 +286,7 @@ bool dpy_gfx_check_format(QemuConsole *con, 


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 w, uint32_t h);

void dpy_gl_update(QemuConsole *con,

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

include/ui/gtk.h

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ 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,

                    uint32_t x, uint32_t y,

                    uint32_t w, uint32_t h);

void gd_egl_scanout_flush(DisplayChangeListener *dcl,

include/ui/sdl2.h

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ 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,

                     uint32_t x, uint32_t y,

                     uint32_t w, uint32_t h);

void sdl2_gl_scanout_flush(DisplayChangeListener *dcl,

ui/console.c

+2 −0
Original line number Diff line number Diff line
@@ -1709,11 +1709,13 @@ QEMUGLContext dpy_gl_ctx_get_current(QemuConsole *con) 


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)

{

    assert(con->gl);

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

                                 backing_y_0_top,

                                 backing_width, backing_height,

                                 x, y, width, height);

}