Commit 74acb997 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20150119-1' into staging 



ui: add shared surface format negotiation.

# gpg: Signature made Mon 19 Jan 2015 12:47:36 GMT using RSA key ID D3E87138
# 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>"

* remotes/kraxel/tags/pull-console-20150119-1:
  ui/sdl2: Support shared surface for more pixman formats
  ui/sdl: Support shared surface for more pixman formats
  ui/gtk: Support shared surface for most pixman formats
  ui/spice: Support shared surface for most pixman formats
  ui/vnc: Support shared surface for most pixman formats
  ui/pixman: add qemu_pixman_check_format
  ui: Add dpy_gfx_check_format() to check backend shared surface support
  ui: Make qemu_default_pixman_format() return 0 on unsupported formats

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents 1e42c353 877417d9

hw/display/vga.c

+14 −4
Original line number Diff line number Diff line
@@ -1437,6 +1437,7 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) 
    uint32_t v, addr1, addr;

    vga_draw_line_func *vga_draw_line = NULL;

    bool share_surface;

    pixman_format_code_t format;

#ifdef HOST_WORDS_BIGENDIAN

    bool byteswap = !s->big_endian_fb;

#else
@@ -1481,8 +1482,19 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) 


    depth = s->get_bpp(s);



    share_surface = (!s->force_shadow) &&

            ( depth == 32 || (depth == 16 && !byteswap) );

    /*

     * Check whether we can share the surface with the backend

     * or whether we need a shadow surface. We share native

     * endian surfaces for 15bpp and above and byteswapped

     * surfaces for 24bpp and above.

     */

    format = qemu_default_pixman_format(depth, !byteswap);

    if (format) {

        share_surface = dpy_gfx_check_format(s->con, format)

            && !s->force_shadow;

    } else {

        share_surface = false;

    }

    if (s->line_offset != s->last_line_offset ||

        disp_width != s->last_width ||

        height != s->last_height ||
@@ -1490,8 +1502,6 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) 
        s->last_byteswap != byteswap ||

        share_surface != is_buffer_shared(surface)) {

        if (share_surface) {

            pixman_format_code_t format =

                qemu_default_pixman_format(depth, !byteswap);

            surface = qemu_create_displaysurface_from(disp_width,

                    height, format, s->line_offset,

                    s->vram_ptr + (s->start_addr * 4));

include/ui/console.h

+4 −0
Original line number Diff line number Diff line
@@ -161,6 +161,8 @@ typedef struct DisplayChangeListenerOps { 
    void (*dpy_gfx_copy)(DisplayChangeListener *dcl,

                         int src_x, int src_y,

                         int dst_x, int dst_y, int w, int h);

    bool (*dpy_gfx_check_format)(DisplayChangeListener *dcl,

                                 pixman_format_code_t format);



    void (*dpy_text_cursor)(DisplayChangeListener *dcl,

                            int x, int y);
@@ -235,6 +237,8 @@ void dpy_gfx_update_dirty(QemuConsole *con, 
                          MemoryRegion *address_space,

                          uint64_t base,

                          bool invalidate);

bool dpy_gfx_check_format(QemuConsole *con,

                          pixman_format_code_t format);



static inline int surface_stride(DisplaySurface *s)

{

include/ui/qemu-pixman.h

+2 −0
Original line number Diff line number Diff line
@@ -37,6 +37,8 @@ PixelFormat qemu_pixelformat_from_pixman(pixman_format_code_t format); 
pixman_format_code_t qemu_default_pixman_format(int bpp, bool native_endian);

int qemu_pixman_get_type(int rshift, int gshift, int bshift);

pixman_format_code_t qemu_pixman_get_format(PixelFormat *pf);

bool qemu_pixman_check_format(DisplayChangeListener *dcl,

                              pixman_format_code_t format);



pixman_image_t *qemu_pixman_linebuf_create(pixman_format_code_t format,

                                           int width);

include/ui/sdl2.h

+2 −0
Original line number Diff line number Diff line
@@ -28,5 +28,7 @@ void sdl2_2d_switch(DisplayChangeListener *dcl, 
                    DisplaySurface *new_surface);

void sdl2_2d_refresh(DisplayChangeListener *dcl);

void sdl2_2d_redraw(struct sdl2_console *scon);

bool sdl2_2d_check_format(DisplayChangeListener *dcl,

                          pixman_format_code_t format);



#endif /* SDL2_H */

ui/console.c

+25 −0
Original line number Diff line number Diff line
@@ -1439,6 +1439,31 @@ void dpy_gfx_replace_surface(QemuConsole *con, 
    qemu_free_displaysurface(old_surface);

}



bool dpy_gfx_check_format(QemuConsole *con,

                          pixman_format_code_t format)

{

    DisplayChangeListener *dcl;

    DisplayState *s = con->ds;



    QLIST_FOREACH(dcl, &s->listeners, next) {

        if (dcl->con && dcl->con != con) {

            /* dcl bound to another console -> skip */

            continue;

        }

        if (dcl->ops->dpy_gfx_check_format) {

            if (!dcl->ops->dpy_gfx_check_format(dcl, format)) {

                return false;

            }

        } else {

            /* default is to whitelist native 32 bpp only */

            if (format != qemu_default_pixman_format(32, true)) {

                return false;

            }

        }

    }

    return true;

}



static void dpy_refresh(DisplayState *s)

{

    DisplayChangeListener *dcl;