david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pixman: drop obsolete fields from DisplaySurface

Browse Source 
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
This commit is contained in:
Gerd Hoffmann 2012-10-10 11:15:52 +02:00
parent 94362682d3
commit 64f735920a
2 changed files with 13 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
console.c
View File

@ -1297,14 +1297,10 @@ static QemuConsole *new_console(DisplayState *ds, console_type_t console_type)
static void qemu_alloc_display(DisplaySurface *surface, int width, int height, static void qemu_alloc_display(DisplaySurface *surface, int width, int height,
int linesize, PixelFormat pf, int newflags) int linesize, PixelFormat pf, int newflags)
{ {
surface->width = width;
surface->height = height;
surface->linesize = linesize;
surface->pf = pf; surface->pf = pf;
qemu_pixman_image_unref(surface->image); qemu_pixman_image_unref(surface->image);
surface->image = NULL; surface->image = NULL;
surface->data = NULL;
surface->format = qemu_pixman_get_format(&pf); surface->format = qemu_pixman_get_format(&pf);
assert(surface->format != 0); assert(surface->format != 0);
@ -1313,7 +1309,6 @@ static void qemu_alloc_display(DisplaySurface *surface, int width, int height,
NULL, linesize); NULL, linesize);
assert(surface->image != NULL); 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;
@ -1347,9 +1342,6 @@ DisplaySurface *qemu_create_displaysurface_from(int width, int height, int bpp,
{ {
DisplaySurface *surface = g_new0(DisplaySurface, 1); DisplaySurface *surface = g_new0(DisplaySurface, 1);
surface->width = width;
surface->height = height;
surface->linesize = linesize;
surface->pf = qemu_default_pixelformat(bpp); surface->pf = qemu_default_pixelformat(bpp);
surface->format = qemu_pixman_get_format(&surface->pf); surface->format = qemu_pixman_get_format(&surface->pf);
@ -1362,7 +1354,6 @@ DisplaySurface *qemu_create_displaysurface_from(int width, int height, int bpp,
#ifdef HOST_WORDS_BIGENDIAN #ifdef HOST_WORDS_BIGENDIAN
surface->flags = QEMU_BIG_ENDIAN_FLAG; surface->flags = QEMU_BIG_ENDIAN_FLAG;
#endif #endif
surface->data = data;
return surface; return surface;
} }

23
console.h
View File

@ -123,10 +123,6 @@ struct DisplaySurface {
pixman_format_code_t format; pixman_format_code_t format;
pixman_image_t *image; pixman_image_t *image;
uint8_t flags; uint8_t flags;
int width;
int height;
int linesize; /* bytes per line */
uint8_t *data;
struct PixelFormat pf; struct PixelFormat pf;
}; };
@ -346,32 +342,39 @@ static inline bool dpy_cursor_define_supported(struct DisplayState *s)
static inline int ds_get_linesize(DisplayState *ds) static inline int ds_get_linesize(DisplayState *ds)
{ {
return ds->surface->linesize; return pixman_image_get_stride(ds->surface->image);
} }
static inline uint8_t* ds_get_data(DisplayState *ds) static inline uint8_t* ds_get_data(DisplayState *ds)
{ {
return ds->surface->data; return (void *)pixman_image_get_data(ds->surface->image);
} }
static inline int ds_get_width(DisplayState *ds) static inline int ds_get_width(DisplayState *ds)
{ {
return ds->surface->width; return pixman_image_get_width(ds->surface->image);
} }
static inline int ds_get_height(DisplayState *ds) static inline int ds_get_height(DisplayState *ds)
{ {
return ds->surface->height; return pixman_image_get_height(ds->surface->image);
} }
static inline int ds_get_bits_per_pixel(DisplayState *ds) static inline int ds_get_bits_per_pixel(DisplayState *ds)
{ {
return ds->surface->pf.bits_per_pixel; int bits = PIXMAN_FORMAT_BPP(ds->surface->format);
return bits;
} }
static inline int ds_get_bytes_per_pixel(DisplayState *ds) static inline int ds_get_bytes_per_pixel(DisplayState *ds)
{ {
return ds->surface->pf.bytes_per_pixel; int bits = PIXMAN_FORMAT_BPP(ds->surface->format);
return (bits + 7) / 8;
}
static inline pixman_format_code_t ds_get_format(DisplayState *ds)
{
return ds->surface->format;
} }
#ifdef CONFIG_CURSES #ifdef CONFIG_CURSES