[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 13/22] pixman: add pixman image to DisplaySurface
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 13/22] pixman: add pixman image to DisplaySurface |
Date: |
Thu, 1 Nov 2012 14:04:08 +0100 |
Surfaces are now allocated using pixman. DisplaySurface gets new
struct fields with pixman image and data. DisplayChangeListeners
can easily start using pixman now.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
console.c | 37 ++++++++++++++++++++++++-------------
console.h | 3 +++
2 files changed, 27 insertions(+), 13 deletions(-)
diff --git a/console.c b/console.c
index 71cc543..5e1c5f5 100644
--- a/console.c
+++ b/console.c
@@ -1319,18 +1319,23 @@ DisplaySurface *qemu_resize_displaysurface(DisplayState
*ds,
void qemu_alloc_display(DisplaySurface *surface, int width, int height,
int linesize, PixelFormat pf, int newflags)
{
- void *data;
surface->width = width;
surface->height = height;
surface->linesize = linesize;
surface->pf = pf;
- if (surface->flags & QEMU_ALLOCATED_FLAG) {
- data = g_realloc(surface->data,
- surface->linesize * surface->height);
- } else {
- data = g_malloc(surface->linesize * surface->height);
- }
- surface->data = (uint8_t *)data;
+
+ qemu_pixman_image_unref(surface->image);
+ surface->image = NULL;
+ surface->data = NULL;
+
+ surface->format = qemu_pixman_get_format(&pf);
+ assert(surface->format != 0);
+ surface->image = pixman_image_create_bits(surface->format,
+ width, height,
+ NULL, linesize);
+ assert(surface->image != NULL);
+
+ surface->data = (uint8_t *)pixman_image_get_data(surface->image);
surface->flags = newflags | QEMU_ALLOCATED_FLAG;
#ifdef HOST_WORDS_BIGENDIAN
surface->flags |= QEMU_BIG_ENDIAN_FLAG;
@@ -1338,14 +1343,22 @@ void qemu_alloc_display(DisplaySurface *surface, int
width, int height,
}
DisplaySurface *qemu_create_displaysurface_from(int width, int height, int bpp,
- int linesize, uint8_t *data)
+ int linesize, uint8_t *data)
{
- DisplaySurface *surface = (DisplaySurface*)
g_malloc0(sizeof(DisplaySurface));
+ DisplaySurface *surface = g_new0(DisplaySurface, 1);
surface->width = width;
surface->height = height;
surface->linesize = linesize;
surface->pf = qemu_default_pixelformat(bpp);
+
+ surface->format = qemu_pixman_get_format(&surface->pf);
+ assert(surface->format != 0);
+ surface->image = pixman_image_create_bits(surface->format,
+ width, height,
+ (void *)data, linesize);
+ assert(surface->image != NULL);
+
#ifdef HOST_WORDS_BIGENDIAN
surface->flags = QEMU_BIG_ENDIAN_FLAG;
#endif
@@ -1360,9 +1373,7 @@ void qemu_free_displaysurface(DisplayState *ds)
if (ds->surface == NULL) {
return;
}
- if (ds->surface->flags & QEMU_ALLOCATED_FLAG) {
- g_free(ds->surface->data);
- }
+ qemu_pixman_image_unref(ds->surface->image);
g_free(ds->surface);
}
diff --git a/console.h b/console.h
index 6be880a..f19e6a4 100644
--- a/console.h
+++ b/console.h
@@ -2,6 +2,7 @@
#define CONSOLE_H
#include "qemu-char.h"
+#include "qemu-pixman.h"
#include "qdict.h"
#include "notify.h"
#include "monitor.h"
@@ -119,6 +120,8 @@ struct PixelFormat {
};
struct DisplaySurface {
+ pixman_format_code_t format;
+ pixman_image_t *image;
uint8_t flags;
int width;
int height;
--
1.7.1
- [Qemu-devel] [PATCH 08/22] console: remove dpy_gfx_fill, (continued)
- [Qemu-devel] [PATCH 08/22] console: remove dpy_gfx_fill, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 07/22] vga: fix text mode updating, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 10/22] pixman: add submodule, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 18/22] pixman: switch screendump function., Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 20/22] pixman/vnc: remove rgb_prepare_row* functions, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 03/22] console: move set_mouse + cursor_define callbacks, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 04/22] console: s/TextConsole/QemuConsole/, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 12/22] pixman: helper functions, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 15/22] console: don't set PixelFormat alpha fields for 32bpp, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 11/22] pixman: windup in configure & makefiles, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 13/22] pixman: add pixman image to DisplaySurface,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 17/22] vga: stop direct access to DisplaySurface fields., Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 06/22] console: init displaychangelisteners on register, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 16/22] qxl: stop direct access to DisplaySurface fields., Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 22/22] pixman: drop obsolete fields from DisplaySurface, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 21/22] pixman/vnc: remove dead code., Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 05/22] console: untangle gfx & txt updates, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 02/22] console: add unregister_displaychangelistener, Gerd Hoffmann, 2012/11/01
- [Qemu-devel] [PATCH 09/22] console: remove DisplayAllocator, Gerd Hoffmann, 2012/11/01