Commit 6bc2fd57 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

vga: cleanup surface handling 



Just set the full_update flag if we need a new DisplaySurface.  Create
a new surface when the flag is set instead of having two places where
qemu_create_displaysurface_from() is called.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
Message-id: 20180525131318.28437-1-kraxel@redhat.com
parent bc820db0

hw/display/vga.c

+19 −17
Original line number Diff line number Diff line
@@ -1548,21 +1548,14 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) 
    } else {

        share_surface = false;

    }



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

        disp_width != s->last_width ||

        height != s->last_height ||

        s->last_depth != depth ||

        s->last_byteswap != byteswap ||

        share_surface != is_buffer_shared(surface)) {

        if (share_surface) {

            surface = qemu_create_displaysurface_from(disp_width,

                    height, format, s->line_offset,

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

            dpy_gfx_replace_surface(s->con, surface);

        } else {

            qemu_console_resize(s->con, disp_width, height);

            surface = qemu_console_surface(s->con);

        }

        /* display parameters changed -> need new display surface */

        s->last_scr_width = disp_width;

        s->last_scr_height = height;

        s->last_width = disp_width;
@@ -1571,15 +1564,24 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) 
        s->last_depth = depth;

        s->last_byteswap = byteswap;

        full_update = 1;

    } else if (is_buffer_shared(surface) &&

               (full_update || surface_data(surface) != s->vram_ptr

                + (s->start_addr * 4))) {

        pixman_format_code_t format =

            qemu_default_pixman_format(depth, !byteswap);

    }

    if (surface_data(surface) != s->vram_ptr + (s->start_addr * 4)

        && is_buffer_shared(surface)) {

        /* base address changed (page flip) -> shared display surfaces

         * must be updated with the new base address */

        full_update = 1;

    }



    if (full_update) {

        if (share_surface) {

            surface = qemu_create_displaysurface_from(disp_width,

                    height, format, s->line_offset,

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

            dpy_gfx_replace_surface(s->con, surface);

        } else {

            qemu_console_resize(s->con, disp_width, height);

            surface = qemu_console_surface(s->con);

        }

    }



    if (shift_control == 0) {