From da229ef3b3c5709b01d62e7a6e213b31bca33d16 Mon Sep 17 00:00:00 2001 From: Gerd Hoffmann Date: Thu, 28 Feb 2013 10:48:02 +0100 Subject: console: rework DisplaySurface handling [vga emu side] Decouple DisplaySurface allocation & deallocation from DisplayState. Replace dpy_gfx_resize + dpy_gfx_setdata with a dpy_gfx_replace_surface function. This handles the graphic hardware emulation. Signed-off-by: Gerd Hoffmann --- include/ui/console.h | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) (limited to 'include/ui/console.h') diff --git a/include/ui/console.h b/include/ui/console.h index 91a1f63e5d..63e6e662c7 100644 --- a/include/ui/console.h +++ b/include/ui/console.h @@ -210,11 +210,8 @@ DisplaySurface* qemu_create_displaysurface_from(int width, int height, int bpp, PixelFormat qemu_different_endianness_pixelformat(int bpp); PixelFormat qemu_default_pixelformat(int bpp); -DisplaySurface *qemu_create_displaysurface(DisplayState *ds, - int width, int height); -DisplaySurface *qemu_resize_displaysurface(DisplayState *ds, - int width, int height); -void qemu_free_displaysurface(DisplayState *ds); +DisplaySurface *qemu_create_displaysurface(int width, int height); +void qemu_free_displaysurface(DisplaySurface *surface); static inline int is_surface_bgr(DisplaySurface *surface) { @@ -236,8 +233,8 @@ void register_displaychangelistener(DisplayState *ds, void unregister_displaychangelistener(DisplayChangeListener *dcl); void dpy_gfx_update(DisplayState *s, int x, int y, int w, int h); -void dpy_gfx_resize(DisplayState *s); -void dpy_gfx_setdata(DisplayState *s); +void dpy_gfx_replace_surface(DisplayState *s, + DisplaySurface *surface); void dpy_refresh(DisplayState *s); void dpy_gfx_copy(struct DisplayState *s, int src_x, int src_y, int dst_x, int dst_y, int w, int h); -- cgit v1.2.3