Remove an unnecessary mutual inclusion loop between qemu-pixman.h and console.h, since the former was only including the latter for 'PixelFormat*', which can be provided by typedefs.h. This requires a minor adjustment to the files which included qemu-pixman.h, since they were relying on it implicitly dragging in all of console.h. Signed-off-by: Peter Maydell <peter.maydell@linaro.org> Acked-by: Gerd Hoffmann <kraxel@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com>
		
			
				
	
	
		
			47 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			47 lines
		
	
	
		
			1.5 KiB
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * This work is licensed under the terms of the GNU GPL, version 2 or later.
 | 
						|
 * See the COPYING file in the top-level directory.
 | 
						|
 */
 | 
						|
 | 
						|
#ifndef QEMU_PIXMAN_H
 | 
						|
#define QEMU_PIXMAN_H
 | 
						|
 | 
						|
/* pixman-0.16.0 headers have a redundant declaration */
 | 
						|
#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE
 | 
						|
#pragma GCC diagnostic ignored "-Wredundant-decls"
 | 
						|
#endif
 | 
						|
#include <pixman.h>
 | 
						|
#ifdef CONFIG_PRAGMA_DIAGNOSTIC_AVAILABLE
 | 
						|
#pragma GCC diagnostic error "-Wredundant-decls"
 | 
						|
#endif
 | 
						|
 | 
						|
#include "qemu/typedefs.h"
 | 
						|
 | 
						|
/*
 | 
						|
 * pixman image formats are defined to be native endian,
 | 
						|
 * that means host byte order on qemu.  So we go define
 | 
						|
 * fixed formats here for cases where it is needed, like
 | 
						|
 * feeding libjpeg / libpng and writing screenshots.
 | 
						|
 */
 | 
						|
 | 
						|
#ifdef HOST_WORDS_BIGENDIAN
 | 
						|
# define PIXMAN_BE_r8g8b8     PIXMAN_r8g8b8
 | 
						|
#else
 | 
						|
# define PIXMAN_BE_r8g8b8     PIXMAN_b8g8r8
 | 
						|
#endif
 | 
						|
 | 
						|
/* -------------------------------------------------------------------- */
 | 
						|
 | 
						|
int qemu_pixman_get_type(int rshift, int gshift, int bshift);
 | 
						|
pixman_format_code_t qemu_pixman_get_format(PixelFormat *pf);
 | 
						|
 | 
						|
pixman_image_t *qemu_pixman_linebuf_create(pixman_format_code_t format,
 | 
						|
                                           int width);
 | 
						|
void qemu_pixman_linebuf_fill(pixman_image_t *linebuf, pixman_image_t *fb,
 | 
						|
                              int width, int x, int y);
 | 
						|
pixman_image_t *qemu_pixman_mirror_create(pixman_format_code_t format,
 | 
						|
                                          pixman_image_t *image);
 | 
						|
void qemu_pixman_image_unref(pixman_image_t *image);
 | 
						|
 | 
						|
#endif /* QEMU_PIXMAN_H */
 |