vitalif
/
mirror_qemu
mirror of https://github.com/proxmox/mirror_qemu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ui: compile out some qemu-pixman functions when !PIXMAN 

Those functions require the PIXMAN library.

Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
Reviewed-by: Thomas Huth <thuth@redhat.com>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Tested-by: Philippe Mathieu-Daudé <philmd@linaro.org>
master
Marc-André Lureau 2023-08-30 13:38:26 +04:00
parent ce59c54c49
commit b3ec48cf92
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
include/ui/qemu-pixman.h
View File

@ -72,17 +72,17 @@ pixman_format_code_t qemu_default_pixman_format(int bpp, bool native_endian);
pixman_format_code_t qemu_drm_format_to_pixman(uint32_t drm_format); pixman_format_code_t qemu_drm_format_to_pixman(uint32_t drm_format);
uint32_t qemu_pixman_to_drm_format(pixman_format_code_t pixman); uint32_t qemu_pixman_to_drm_format(pixman_format_code_t pixman);
int qemu_pixman_get_type(int rshift, int gshift, int bshift); int qemu_pixman_get_type(int rshift, int gshift, int bshift);
pixman_format_code_t qemu_pixman_get_format(PixelFormat *pf);
bool qemu_pixman_check_format(DisplayChangeListener *dcl, bool qemu_pixman_check_format(DisplayChangeListener *dcl,
pixman_format_code_t format); pixman_format_code_t format);
#ifdef CONFIG_PIXMAN
pixman_format_code_t qemu_pixman_get_format(PixelFormat *pf);
pixman_image_t *qemu_pixman_linebuf_create(pixman_format_code_t format, pixman_image_t *qemu_pixman_linebuf_create(pixman_format_code_t format,
int width); int width);
void qemu_pixman_linebuf_fill(pixman_image_t *linebuf, pixman_image_t *fb, void qemu_pixman_linebuf_fill(pixman_image_t *linebuf, pixman_image_t *fb,
int width, int x, int y); int width, int x, int y);
pixman_image_t *qemu_pixman_mirror_create(pixman_format_code_t format, pixman_image_t *qemu_pixman_mirror_create(pixman_format_code_t format,
pixman_image_t *image); pixman_image_t *image);
void qemu_pixman_image_unref(pixman_image_t *image);
pixman_image_t *qemu_pixman_glyph_from_vgafont(int height, const uint8_t *font, pixman_image_t *qemu_pixman_glyph_from_vgafont(int height, const uint8_t *font,
unsigned int ch); unsigned int ch);
@ -91,6 +91,9 @@ void qemu_pixman_glyph_render(pixman_image_t *glyph,
pixman_color_t *fgcol, pixman_color_t *fgcol,
pixman_color_t *bgcol, pixman_color_t *bgcol,
int x, int y, int cw, int ch); int x, int y, int cw, int ch);
#endif
void qemu_pixman_image_unref(pixman_image_t *image);
G_DEFINE_AUTOPTR_CLEANUP_FUNC(pixman_image_t, qemu_pixman_image_unref) G_DEFINE_AUTOPTR_CLEANUP_FUNC(pixman_image_t, qemu_pixman_image_unref)

6
ui/qemu-pixman.c
View File

@ -145,6 +145,7 @@ int qemu_pixman_get_type(int rshift, int gshift, int bshift)
return type; return type;
} }
#ifdef CONFIG_PIXMAN
pixman_format_code_t qemu_pixman_get_format(PixelFormat *pf) pixman_format_code_t qemu_pixman_get_format(PixelFormat *pf)
{ {
pixman_format_code_t format; pixman_format_code_t format;
@ -158,6 +159,7 @@ pixman_format_code_t qemu_pixman_get_format(PixelFormat *pf)
} }
return format; return format;
} }
#endif
/* /*
* Return true for known-good pixman conversions. * Return true for known-good pixman conversions.
@ -186,6 +188,7 @@ bool qemu_pixman_check_format(DisplayChangeListener *dcl,
} }
} }
#ifdef CONFIG_PIXMAN
pixman_image_t *qemu_pixman_linebuf_create(pixman_format_code_t format, pixman_image_t *qemu_pixman_linebuf_create(pixman_format_code_t format,
int width) int width)
{ {
@ -211,6 +214,7 @@ pixman_image_t *qemu_pixman_mirror_create(pixman_format_code_t format,
NULL, NULL,
pixman_image_get_stride(image)); pixman_image_get_stride(image));
} }
#endif
void qemu_pixman_image_unref(pixman_image_t *image) void qemu_pixman_image_unref(pixman_image_t *image)
{ {
@ -220,6 +224,7 @@ void qemu_pixman_image_unref(pixman_image_t *image)
pixman_image_unref(image); pixman_image_unref(image);
} }
#ifdef CONFIG_PIXMAN
pixman_image_t *qemu_pixman_glyph_from_vgafont(int height, const uint8_t *font, pixman_image_t *qemu_pixman_glyph_from_vgafont(int height, const uint8_t *font,
unsigned int ch) unsigned int ch)
{ {
@ -262,3 +267,4 @@ void qemu_pixman_glyph_render(pixman_image_t *glyph,
pixman_image_unref(ifg); pixman_image_unref(ifg);
pixman_image_unref(ibg); pixman_image_unref(ibg);
} }
#endif /* CONFIG_PIXMAN */