[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 09/18] console: add surface_*() getters
From: |
Gerd Hoffmann |
Subject: |
[Qemu-devel] [PATCH 09/18] console: add surface_*() getters |
Date: |
Tue, 12 Mar 2013 11:32:40 +0100 |
Add convinence wrappers to query DisplaySurface properties.
Simliar to ds_get_*, but operating in the DisplaySurface
not the DisplayState.
With this patch in place ui frontents can stop using DisplayState
in the rendering code paths, they can simply operate using the
DisplaySurface passed in via dpy_gfx_switch callback.
Signed-off-by: Gerd Hoffmann <address@hidden>
---
include/ui/console.h | 46 ++++++++++++++++++++++++++++++++++++++--------
1 file changed, 38 insertions(+), 8 deletions(-)
diff --git a/include/ui/console.h b/include/ui/console.h
index f15a541..ab59e15 100644
--- a/include/ui/console.h
+++ b/include/ui/console.h
@@ -244,36 +244,66 @@ void dpy_mouse_set(struct DisplayState *s, int x, int y,
int on);
void dpy_cursor_define(struct DisplayState *s, QEMUCursor *cursor);
bool dpy_cursor_define_supported(struct DisplayState *s);
+static inline int surface_stride(DisplaySurface *s)
+{
+ return pixman_image_get_stride(s->image);
+}
+
+static inline void *surface_data(DisplaySurface *s)
+{
+ return pixman_image_get_data(s->image);
+}
+
+static inline int surface_width(DisplaySurface *s)
+{
+ return pixman_image_get_width(s->image);
+}
+
+static inline int surface_height(DisplaySurface *s)
+{
+ return pixman_image_get_height(s->image);
+}
+
+static inline int surface_bits_per_pixel(DisplaySurface *s)
+{
+ int bits = PIXMAN_FORMAT_BPP(s->format);
+ return bits;
+}
+
+static inline int surface_bytes_per_pixel(DisplaySurface *s)
+{
+ int bits = PIXMAN_FORMAT_BPP(s->format);
+ return (bits + 7) / 8;
+}
+
static inline int ds_get_linesize(DisplayState *ds)
{
- return pixman_image_get_stride(ds->surface->image);
+ return surface_stride(ds->surface);
}
static inline uint8_t* ds_get_data(DisplayState *ds)
{
- return (void *)pixman_image_get_data(ds->surface->image);
+ return surface_data(ds->surface);
}
static inline int ds_get_width(DisplayState *ds)
{
- return pixman_image_get_width(ds->surface->image);
+ return surface_width(ds->surface);
}
static inline int ds_get_height(DisplayState *ds)
{
- return pixman_image_get_height(ds->surface->image);
+ return surface_height(ds->surface);
}
static inline int ds_get_bits_per_pixel(DisplayState *ds)
{
- int bits = PIXMAN_FORMAT_BPP(ds->surface->format);
- return bits;
+ return surface_bits_per_pixel(ds->surface);
}
static inline int ds_get_bytes_per_pixel(DisplayState *ds)
{
- int bits = PIXMAN_FORMAT_BPP(ds->surface->format);
- return (bits + 7) / 8;
+ return surface_bytes_per_pixel(ds->surface);
}
static inline pixman_format_code_t ds_get_format(DisplayState *ds)
--
1.7.9.7
- [Qemu-devel] [PATCH 05/18] qxl: better vga init in enter_vga_mode, (continued)
- [Qemu-devel] [PATCH 05/18] qxl: better vga init in enter_vga_mode, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 10/18] gtk: stop using DisplayState, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 16/18] console: stop using DisplayState in gfx hardware emulation, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 18/18] console: remove ds_get_* helper functions, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 17/18] console: zap color_table, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 07/18] console: rework DisplaySurface handling [vga emu side], Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 15/18] console: zap displaystate from dcl callbacks, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 12/18] sdl: stop using DisplayState, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 11/18] vnc: stop using DisplayState, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 08/18] console: rework DisplaySurface handling [dcl/ui side], Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 09/18] console: add surface_*() getters,
Gerd Hoffmann <=
- [Qemu-devel] [PATCH 13/18] spice: stop using DisplayState, Gerd Hoffmann, 2013/03/12
- [Qemu-devel] [PATCH 14/18] cocoa: stop using DisplayState, Gerd Hoffmann, 2013/03/12