[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 5/7] spice: switch to pixman
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 5/7] spice: switch to pixman |
Date: |
Fri, 2 Nov 2012 10:35:17 +0100 |
Switch over spice-display.c to use the pixman library
instead of the home-grown pflib bits.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
console.h | 5 +++++
qemu-pixman.c | 13 +++++++++++++
qemu-pixman.h | 2 ++
ui/spice-display.c | 51 ++++++++++++++++++++++-----------------------------
ui/spice-display.h | 7 +++----
5 files changed, 45 insertions(+), 33 deletions(-)
diff --git a/console.h b/console.h
index 33ad69b..a52a607 100644
--- a/console.h
+++ b/console.h
@@ -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;
+}
+
#ifdef CONFIG_CURSES
#include <curses.h>
typedef chtype console_ch_t;
diff --git a/qemu-pixman.c b/qemu-pixman.c
index 7547ed7..71a9ea4 100644
--- a/qemu-pixman.c
+++ b/qemu-pixman.c
@@ -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) {
diff --git a/qemu-pixman.h b/qemu-pixman.h
index 7652c41..e267d73 100644
--- a/qemu-pixman.h
+++ b/qemu-pixman.h
@@ -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 */
diff --git a/ui/spice-display.c b/ui/spice-display.c
index fb99148..fe2fdfb 100644
--- a/ui/spice-display.c
+++ b/ui/spice-display.c
@@ -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) {
diff --git a/ui/spice-display.h b/ui/spice-display.h
index d766927..38b6ea9 100644
--- a/ui/spice-display.h
+++ b/ui/spice-display.h
@@ -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;
--
1.7.1
- [Qemu-devel] [PULL 0/7] spice patch queue, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 3/7] qxl: fix cursor reset, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 2/7] hw/qxl: qxl_send_events: nop if stopped, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 5/7] spice: switch to pixman,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 1/7] hw/qxl: guest bug on primary create with stride %4 != 0, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 7/7] spice: fix initialization order, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 4/7] qxl: call dpy_gfx_resize when entering vga mode, Gerd Hoffmann, 2012/11/02
- [Qemu-devel] [PATCH 6/7] pflib: unused, remove it., Gerd Hoffmann, 2012/11/02
- Re: [Qemu-devel] [PULL 0/7] spice patch queue, Gerd Hoffmann, 2012/11/05
- Re: [Qemu-devel] [PULL 0/7] spice patch queue, Anthony Liguori, 2012/11/14