mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

pixman: add pixman image to DisplaySurface

Browse Source 
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 <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2012-09-26 15:20:05 +02:00
parent d2ec7e24a2
commit 69c7777720
2 changed files with 27 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
console.c
View File

@ -1319,18 +1319,23 @@ DisplaySurface *qemu_resize_displaysurface(DisplayState *ds,
void qemu_alloc_display(DisplaySurface *surface, int width, int height, void qemu_alloc_display(DisplaySurface *surface, int width, int height,
int linesize, PixelFormat pf, int newflags) int linesize, PixelFormat pf, int newflags)
{ {
void *data;
surface->width = width; surface->width = width;
surface->height = height; surface->height = height;
surface->linesize = linesize; surface->linesize = linesize;
surface->pf = pf; surface->pf = pf;
if (surface->flags & QEMU_ALLOCATED_FLAG) {
data = g_realloc(surface->data, qemu_pixman_image_unref(surface->image);
surface->linesize * surface->height); surface->image = NULL;
} else { surface->data = NULL;
data = g_malloc(surface->linesize * surface->height);
} surface->format = qemu_pixman_get_format(&pf);
surface->data = (uint8_t *)data; 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; surface->flags = newflags | QEMU_ALLOCATED_FLAG;
#ifdef HOST_WORDS_BIGENDIAN #ifdef HOST_WORDS_BIGENDIAN
surface->flags |= QEMU_BIG_ENDIAN_FLAG; 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, 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->width = width;
surface->height = height; surface->height = height;
surface->linesize = linesize; surface->linesize = linesize;
surface->pf = qemu_default_pixelformat(bpp); 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 #ifdef HOST_WORDS_BIGENDIAN
surface->flags = QEMU_BIG_ENDIAN_FLAG; surface->flags = QEMU_BIG_ENDIAN_FLAG;
#endif #endif
@ -1360,9 +1373,7 @@ void qemu_free_displaysurface(DisplayState *ds)
if (ds->surface == NULL) { if (ds->surface == NULL) {
return; return;
} }
if (ds->surface->flags & QEMU_ALLOCATED_FLAG) { qemu_pixman_image_unref(ds->surface->image);
g_free(ds->surface->data);
}
g_free(ds->surface); g_free(ds->surface);
} }

3
console.h
View File

@ -2,6 +2,7 @@
#define CONSOLE_H #define CONSOLE_H
#include "qemu-char.h" #include "qemu-char.h"
#include "qemu-pixman.h"
#include "qdict.h" #include "qdict.h"
#include "notify.h" #include "notify.h"
#include "monitor.h" #include "monitor.h"
@ -119,6 +120,8 @@ struct PixelFormat {
}; };
struct DisplaySurface { struct DisplaySurface {
pixman_format_code_t format;
pixman_image_t *image;
uint8_t flags; uint8_t flags;
int width; int width;
int height; int height;