mirror of
https://github.com/Motorhead1991/qemu.git
synced 2025-08-07 01:33:56 -06:00
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:
parent
6aae3df15d
commit
ffe8b821a1
3 changed files with 37 additions and 37 deletions
26
ui/sdl.c
26
ui/sdl.c
|
@ -176,22 +176,18 @@ static DisplaySurface* sdl_create_displaysurface(int width, int height)
|
|||
|
||||
surface->width = width;
|
||||
surface->height = height;
|
||||
|
||||
if (scaling_active) {
|
||||
if (host_format.BytesPerPixel != 2 && host_format.BytesPerPixel != 4) {
|
||||
surface->linesize = width * 4;
|
||||
surface->pf = qemu_default_pixelformat(32);
|
||||
} else {
|
||||
surface->linesize = width * host_format.BytesPerPixel;
|
||||
surface->pf = sdl_to_qemu_pixelformat(&host_format);
|
||||
}
|
||||
#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);
|
||||
|
||||
if (scaling_active) {
|
||||
int linesize;
|
||||
PixelFormat pf;
|
||||
if (host_format.BytesPerPixel != 2 && host_format.BytesPerPixel != 4) {
|
||||
linesize = width * 4;
|
||||
pf = qemu_default_pixelformat(32);
|
||||
} else {
|
||||
linesize = width * host_format.BytesPerPixel;
|
||||
pf = sdl_to_qemu_pixelformat(&host_format);
|
||||
}
|
||||
qemu_alloc_display(surface, width, height, linesize, pf, 0);
|
||||
return surface;
|
||||
}
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue