ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Consolidate DisplaySurface allocation in qemu_alloc_display() 

This removes various code duplication from console.e and sdl.c

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>
This commit is contained in:
Jes Sorensen 2011-03-16 13:33:30 +01:00 committed by Anthony Liguori
parent 6aae3df15d
commit ffe8b821a1
3 changed files with 37 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
console.c
View File

@ -1278,38 +1278,40 @@ static DisplaySurface* defaultallocator_create_displaysurface(int width, int hei
{ {
DisplaySurface *surface = (DisplaySurface*) qemu_mallocz(sizeof(DisplaySurface)); DisplaySurface *surface = (DisplaySurface*) qemu_mallocz(sizeof(DisplaySurface));
surface->width = width; int linesize = width * 4;
surface->height = height; qemu_alloc_display(surface, width, height, linesize,
surface->linesize = width * 4; qemu_default_pixelformat(32), 0);
surface->pf = qemu_default_pixelformat(32);
#ifdef HOST_WORDS_BIGENDIAN
surface->flags = QEMU_ALLOCATED_FLAG | QEMU_BIG_ENDIAN_FLAG;
#else
surface->flags = QEMU_ALLOCATED_FLAG;
#endif
surface->data = (uint8_t*) qemu_mallocz(surface->linesize * surface->height);
return surface; return surface;
} }
static DisplaySurface* defaultallocator_resize_displaysurface(DisplaySurface *surface, static DisplaySurface* defaultallocator_resize_displaysurface(DisplaySurface *surface,
int width, int height) int width, int height)
{ {
int linesize = width * 4;
qemu_alloc_display(surface, width, height, linesize,
qemu_default_pixelformat(32), 0);
return surface;
}
void qemu_alloc_display(DisplaySurface *surface, int width, int height,
int linesize, PixelFormat pf, int newflags)
{
void *data;
surface->width = width; surface->width = width;
surface->height = height; surface->height = height;
surface->linesize = width * 4; surface->linesize = linesize;
surface->pf = qemu_default_pixelformat(32); surface->pf = pf;
if (surface->flags & QEMU_ALLOCATED_FLAG) if (surface->flags & QEMU_ALLOCATED_FLAG) {
surface->data = (uint8_t*) qemu_realloc(surface->data, surface->linesize * surface->height); data = qemu_realloc(surface->data,
else surface->linesize * surface->height);
surface->data = (uint8_t*) qemu_malloc(surface->linesize * surface->height); } else {
data = qemu_malloc(surface->linesize * surface->height);
}
surface->data = (uint8_t *)data;
surface->flags = newflags | QEMU_ALLOCATED_FLAG;
#ifdef HOST_WORDS_BIGENDIAN #ifdef HOST_WORDS_BIGENDIAN
surface->flags = QEMU_ALLOCATED_FLAG | QEMU_BIG_ENDIAN_FLAG; surface->flags |= QEMU_BIG_ENDIAN_FLAG;
#else
surface->flags = QEMU_ALLOCATED_FLAG;
#endif #endif
return surface;
} }
DisplaySurface* qemu_create_displaysurface_from(int width, int height, int bpp, DisplaySurface* qemu_create_displaysurface_from(int width, int height, int bpp,

2
console.h
View File

@ -189,6 +189,8 @@ void register_displaystate(DisplayState *ds);
DisplayState *get_displaystate(void); DisplayState *get_displaystate(void);
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);
void qemu_alloc_display(DisplaySurface *surface, int width, int height,
int linesize, PixelFormat pf, int newflags);
PixelFormat qemu_different_endianness_pixelformat(int bpp); PixelFormat qemu_different_endianness_pixelformat(int bpp);
PixelFormat qemu_default_pixelformat(int bpp); PixelFormat qemu_default_pixelformat(int bpp);

18
ui/sdl.c
View File

@ -178,20 +178,16 @@ static DisplaySurface* sdl_create_displaysurface(int width, int height)
surface->height = height; surface->height = height;
if (scaling_active) { if (scaling_active) {
int linesize;
PixelFormat pf;
if (host_format.BytesPerPixel != 2 && host_format.BytesPerPixel != 4) { if (host_format.BytesPerPixel != 2 && host_format.BytesPerPixel != 4) {
surface->linesize = width * 4; linesize = width * 4;
surface->pf = qemu_default_pixelformat(32); pf = qemu_default_pixelformat(32);
} else { } else {
surface->linesize = width * host_format.BytesPerPixel; linesize = width * host_format.BytesPerPixel;
surface->pf = sdl_to_qemu_pixelformat(&host_format); pf = sdl_to_qemu_pixelformat(&host_format);
} }
#ifdef HOST_WORDS_BIGENDIAN qemu_alloc_display(surface, width, height, linesize, pf, 0);
surface->flags = QEMU_ALLOCATED_FLAG | QEMU_BIG_ENDIAN_FLAG;
#else
surface->flags = QEMU_ALLOCATED_FLAG;
#endif
surface->data = (uint8_t*) qemu_mallocz(surface->linesize * surface->height);
return surface; return surface;
} }