Commit 0dfa7e30 authored by Peter Maydell's avatar Peter Maydell
Browse files

Merge remote-tracking branch 'remotes/kraxel/tags/pull-console-20140905-2' into staging 



console: pixman switchover continued, add some infrastructure to make it
         easier using pixman in display device emulation.

# gpg: Signature made Fri 05 Sep 2014 14:38:57 BST 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-20140905-2:
  console: Remove unused QEMU_BIG_ENDIAN_FLAG
  console: add qemu_pixman_linebuf_copy
  console: add dpy_gfx_update_dirty
  console: add qemu_create_displaysurface_guestmem
  console: stop using PixelFormat
  console: reimplement qemu_default_pixelformat
  console: add qemu_default_pixman_format
  console: add qemu_pixelformat_from_pixman

Signed-off-by: default avatarPeter Maydell <peter.maydell@linaro.org>
parents fc3b9aa8 77bfcf28

hw/display/qxl-render.c

+4 −3
Original line number Diff line number Diff line
@@ -116,13 +116,14 @@ static void qxl_render_update_area_unlocked(PCIQXLDevice *qxl) 
               qxl->guest_primary.bytes_pp,

               qxl->guest_primary.bits_pp);

        if (qxl->guest_primary.qxl_stride > 0) {

            pixman_format_code_t format =

                qemu_default_pixman_format(qxl->guest_primary.bits_pp, true);

            surface = qemu_create_displaysurface_from

                (qxl->guest_primary.surface.width,

                 qxl->guest_primary.surface.height,

                 qxl->guest_primary.bits_pp,

                 format,

                 qxl->guest_primary.abs_stride,

                 qxl->guest_primary.data,

                 false);

                 qxl->guest_primary.data);

        } else {

            surface = qemu_create_displaysurface

                (qxl->guest_primary.surface.width,

hw/display/vga.c

+8 −4
Original line number Diff line number Diff line
@@ -1725,9 +1725,11 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) 
        height != s->last_height ||

        s->last_depth != depth) {

        if (depth == 32 || (depth == 16 && !byteswap)) {

            pixman_format_code_t format =

                qemu_default_pixman_format(depth, !byteswap);

            surface = qemu_create_displaysurface_from(disp_width,

                    height, depth, s->line_offset,

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

                    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);
@@ -1743,9 +1745,11 @@ static void vga_draw_graphic(VGACommonState *s, int full_update) 
    } 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);

        surface = qemu_create_displaysurface_from(disp_width,

                height, depth, s->line_offset,

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

                height, format, s->line_offset,

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

        dpy_gfx_replace_surface(s->con, surface);

    }

hw/display/vmware_vga.c

+4 −2
Original line number Diff line number Diff line
@@ -1052,10 +1052,12 @@ static inline void vmsvga_check_size(struct vmsvga_state_s *s) 
        s->new_height != surface_height(surface) ||

        s->new_depth != surface_bits_per_pixel(surface)) {

        int stride = (s->new_depth * s->new_width) / 8;

        pixman_format_code_t format =

            qemu_default_pixman_format(s->new_depth, true);

        trace_vmware_setmode(s->new_width, s->new_height, s->new_depth);

        surface = qemu_create_displaysurface_from(s->new_width, s->new_height,

                                                  s->new_depth, stride,

                                                  s->vga.vram_ptr, false);

                                                  format, stride,

                                                  s->vga.vram_ptr);

        dpy_gfx_replace_surface(s->vga.con, surface);

        s->invalidated = 1;

    }

hw/display/xenfb.c

+5 −3
Original line number Diff line number Diff line
@@ -713,15 +713,17 @@ static void xenfb_update(void *opaque) 


    /* resize if needed */

    if (xenfb->do_resize) {

        pixman_format_code_t format;



        xenfb->do_resize = 0;

        switch (xenfb->depth) {

        case 16:

        case 32:

            /* console.c supported depth -> buffer can be used directly */

            format = qemu_default_pixman_format(xenfb->depth, true);

            surface = qemu_create_displaysurface_from

                (xenfb->width, xenfb->height, xenfb->depth,

                 xenfb->row_stride, xenfb->pixels + xenfb->offset,

                 false);

                (xenfb->width, xenfb->height, format,

                 xenfb->row_stride, xenfb->pixels + xenfb->offset);

            break;

        default:

            /* we must convert stuff */

include/ui/console.h

+16 −9
Original line number Diff line number Diff line
@@ -102,8 +102,7 @@ struct QemuConsoleClass { 
    ObjectClass parent_class;

};



#define QEMU_BIG_ENDIAN_FLAG    0x01

#define QEMU_ALLOCATED_FLAG     0x02

#define QEMU_ALLOCATED_FLAG     0x01



struct PixelFormat {

    uint8_t bits_per_pixel;
@@ -119,8 +118,6 @@ struct DisplaySurface { 
    pixman_format_code_t format;

    pixman_image_t *image;

    uint8_t flags;



    struct PixelFormat pf;

};



typedef struct QemuUIInfo {
@@ -188,9 +185,13 @@ struct DisplayChangeListener { 
};



DisplayState *init_displaystate(void);

DisplaySurface* qemu_create_displaysurface_from(int width, int height, int bpp,

                                                int linesize, uint8_t *data,

                                                bool byteswap);

DisplaySurface *qemu_create_displaysurface_from(int width, int height,

                                                pixman_format_code_t format,

                                                int linesize, uint8_t *data);

DisplaySurface *qemu_create_displaysurface_guestmem(int width, int height,

                                                    pixman_format_code_t format,

                                                    int linesize,

                                                    uint64_t addr);

PixelFormat qemu_different_endianness_pixelformat(int bpp);

PixelFormat qemu_default_pixelformat(int bpp);
@@ -199,11 +200,13 @@ void qemu_free_displaysurface(DisplaySurface *surface); 


static inline int is_surface_bgr(DisplaySurface *surface)

{

    if (surface->pf.bits_per_pixel == 32 && surface->pf.rshift == 0)

    if (PIXMAN_FORMAT_BPP(surface->format) == 32 &&

        PIXMAN_FORMAT_TYPE(surface->format) == PIXMAN_TYPE_ABGR) {

        return 1;

    else

    } else {

        return 0;

    }

}



static inline int is_buffer_shared(DisplaySurface *surface)

{
@@ -228,6 +231,10 @@ void dpy_text_resize(QemuConsole *con, int w, int h); 
void dpy_mouse_set(QemuConsole *con, int x, int y, int on);

void dpy_cursor_define(QemuConsole *con, QEMUCursor *cursor);

bool dpy_cursor_define_supported(QemuConsole *con);

void dpy_gfx_update_dirty(QemuConsole *con,

                          MemoryRegion *address_space,

                          uint64_t base,

                          bool invalidate);



static inline int surface_stride(DisplaySurface *s)

{