Commit d9a86569 authored by Gerd Hoffmann's avatar Gerd Hoffmann
Browse files

spice: switch to pixman 



Switch over spice-display.c to use the pixman library
instead of the home-grown pflib bits.

Signed-off-by: default avatarGerd Hoffmann <kraxel@redhat.com>
parent e32c25b5

console.h

+5 −0
Original line number Diff line number Diff line
@@ -377,6 +377,11 @@ static inline pixman_format_code_t ds_get_format(DisplayState *ds) 
    return ds->surface->format;

}



static inline pixman_image_t *ds_get_image(DisplayState *ds)

{

    return ds->surface->image;

}



static inline int ds_get_depth(DisplayState *ds)

{

    return ds->surface->pf.depth;

qemu-pixman.c

+13 −0
Original line number Diff line number Diff line
@@ -51,6 +51,19 @@ void qemu_pixman_linebuf_fill(pixman_image_t *linebuf, pixman_image_t *fb, 
                           0, y, 0, 0, 0, 0, width, 1);

}



pixman_image_t *qemu_pixman_mirror_create(pixman_format_code_t format,

                                          pixman_image_t *image)

{

    pixman_image_t *mirror;



    mirror = pixman_image_create_bits(format,

                                      pixman_image_get_width(image),

                                      pixman_image_get_height(image),

                                      NULL,

                                      pixman_image_get_stride(image));

    return mirror;

}



void qemu_pixman_image_unref(pixman_image_t *image)

{

    if (image == NULL) {

qemu-pixman.h

+2 −0
Original line number Diff line number Diff line
@@ -27,6 +27,8 @@ pixman_image_t *qemu_pixman_linebuf_create(pixman_format_code_t format, 
                                           int width);

void qemu_pixman_linebuf_fill(pixman_image_t *linebuf, pixman_image_t *fb,

                              int width, int y);

pixman_image_t *qemu_pixman_mirror_create(pixman_format_code_t format,

                                          pixman_image_t *image);

void qemu_pixman_image_unref(pixman_image_t *image);



#endif /* QEMU_PIXMAN_H */

ui/spice-display.c

+22 −29
Original line number Diff line number Diff line
@@ -150,9 +150,9 @@ static void qemu_spice_create_one_update(SimpleSpiceDisplay *ssd, 
    QXLDrawable *drawable;

    QXLImage *image;

    QXLCommand *cmd;

    uint8_t *src, *mirror, *dst;

    int by, bw, bh, offset, bytes;

    int bw, bh;

    struct timespec time_space;

    pixman_image_t *dest;



    trace_qemu_spice_create_update(

           rect->left, rect->right,
@@ -195,20 +195,15 @@ static void qemu_spice_create_one_update(SimpleSpiceDisplay *ssd, 
    image->bitmap.palette = 0;

    image->bitmap.format = SPICE_BITMAP_FMT_32BIT;



    offset =

        rect->top * ds_get_linesize(ssd->ds) +

        rect->left * ds_get_bytes_per_pixel(ssd->ds);

    bytes = ds_get_bytes_per_pixel(ssd->ds) * bw;

    src = ds_get_data(ssd->ds) + offset;

    mirror = ssd->ds_mirror + offset;

    dst = update->bitmap;

    for (by = 0; by < bh; by++) {

        memcpy(mirror, src, bytes);

        qemu_pf_conv_run(ssd->conv, dst, mirror, bw);

        src += ds_get_linesize(ssd->ds);

        mirror += ds_get_linesize(ssd->ds);

        dst += image->bitmap.stride;

    }

    dest = pixman_image_create_bits(PIXMAN_x8r8g8b8, bw, bh,

                                    (void *)update->bitmap, bw * 4);

    pixman_image_composite(PIXMAN_OP_SRC, ssd->surface, NULL, ssd->mirror,

                           rect->left, rect->top, 0, 0,

                           rect->left, rect->top, bw, bh);

    pixman_image_composite(PIXMAN_OP_SRC, ssd->mirror, NULL, dest,

                           rect->left, rect->top, 0, 0,

                           0, 0, bw, bh);

    pixman_image_unref(dest);



    cmd->type = QXL_CMD_DRAW;

    cmd->data = (uintptr_t)drawable;
@@ -229,14 +224,10 @@ static void qemu_spice_create_update(SimpleSpiceDisplay *ssd) 
        return;

    };



    if (ssd->conv == NULL) {

        PixelFormat dst = qemu_default_pixelformat(32);

        ssd->conv = qemu_pf_conv_get(&dst, &ssd->ds->surface->pf);

        assert(ssd->conv);

    }

    if (ssd->ds_mirror == NULL) {

        int size = ds_get_height(ssd->ds) * ds_get_linesize(ssd->ds);

        ssd->ds_mirror = g_malloc0(size);

    if (ssd->surface == NULL) {

        ssd->surface = pixman_image_ref(ds_get_image(ssd->ds));

        ssd->mirror  = qemu_pixman_mirror_create(ds_get_format(ssd->ds),

                                                 ds_get_image(ssd->ds));

    }



    for (blk = 0; blk < blocks; blk++) {
@@ -244,7 +235,7 @@ static void qemu_spice_create_update(SimpleSpiceDisplay *ssd) 
    }



    guest = ds_get_data(ssd->ds);

    mirror = ssd->ds_mirror;

    mirror = (void *)pixman_image_get_data(ssd->mirror);

    for (y = ssd->dirty.top; y < ssd->dirty.bottom; y++) {

        yoff = y * ds_get_linesize(ssd->ds);

        for (x = ssd->dirty.left; x < ssd->dirty.right; x += blksize) {
@@ -383,10 +374,12 @@ void qemu_spice_display_resize(SimpleSpiceDisplay *ssd) 
    dprint(1, "%s:\n", __FUNCTION__);



    memset(&ssd->dirty, 0, sizeof(ssd->dirty));

    qemu_pf_conv_put(ssd->conv);

    ssd->conv = NULL;

    g_free(ssd->ds_mirror);

    ssd->ds_mirror = NULL;

    if (ssd->surface) {

        pixman_image_unref(ssd->surface);

        ssd->surface = NULL;

        pixman_image_unref(ssd->mirror);

        ssd->mirror = NULL;

    }



    qemu_mutex_lock(&ssd->lock);

    while ((update = QTAILQ_FIRST(&ssd->updates)) != NULL) {

ui/spice-display.h

+3 −4
Original line number Diff line number Diff line
@@ -20,8 +20,7 @@ 
#include <spice/qxl_dev.h>



#include "qemu-thread.h"

#include "console.h"

#include "pflib.h"

#include "qemu-pixman.h"

#include "sysemu.h"



#define NUM_MEMSLOTS 8
@@ -72,13 +71,13 @@ typedef struct SimpleSpiceUpdate SimpleSpiceUpdate; 


struct SimpleSpiceDisplay {

    DisplayState *ds;

    uint8_t *ds_mirror;

    void *buf;

    int bufsize;

    QXLWorker *worker;

    QXLInstance qxl;

    uint32_t unique;

    QemuPfConv *conv;

    pixman_image_t *surface;

    pixman_image_t *mirror;

    int32_t num_surfaces;



    QXLRect dirty;