Commit 0a323e66 authored Jan 14, 2019 by Philippe Mathieu-Daudé Committed by Thomas Huth Jan 22, 2019

ui/console: Remove PixelFormat from qemu/typedefs.h



Header files requiring PixelFormat already include "ui/qemu-pixman.h".

To clean "qemu/typedefs.h", move the declaration to "ui/qemu-pixman.h"
(removing the forward declaration).

Suggested-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com>
Acked-by: Gerd Hoffmann <kraxel@redhat.com>
Signed-off-by: Thomas Huth <thuth@redhat.com>

parent 5a4c2e59

include/qemu/typedefs.h

+0 −1

Original line number	Diff line number	Diff line
		@@ -71,7 +71,6 @@ typedef struct PCIExpressHost PCIExpressHost;
		typedef struct PCIHostDeviceAddress PCIHostDeviceAddress;
		typedef struct PCIHostState PCIHostState;
		typedef struct PCMachineState PCMachineState;
		typedef struct PixelFormat PixelFormat;
		typedef struct PostcopyDiscardState PostcopyDiscardState;
		typedef struct Property Property;
		typedef struct PropertyInfo PropertyInfo;

include/ui/console.h

+0 −10

Original line number	Diff line number	Diff line
		@@ -121,16 +121,6 @@ struct QemuConsoleClass {

		#define QEMU_ALLOCATED_FLAG 0x01

		struct PixelFormat {
		uint8_t bits_per_pixel;
		uint8_t bytes_per_pixel;
		uint8_t depth; /* color depth in bits */
		uint32_t rmask, gmask, bmask, amask;
		uint8_t rshift, gshift, bshift, ashift;
		uint8_t rmax, gmax, bmax, amax;
		uint8_t rbits, gbits, bbits, abits;
		};

		typedef struct DisplaySurface {
		pixman_format_code_t format;
		pixman_image_t *image;

include/ui/qemu-pixman.h

+10 −0

Original line number	Diff line number	Diff line
		@@ -53,6 +53,16 @@

		/* -------------------------------------------------------------------- */

		typedef struct PixelFormat {
		uint8_t bits_per_pixel;
		uint8_t bytes_per_pixel;
		uint8_t depth; /* color depth in bits */
		uint32_t rmask, gmask, bmask, amask;
		uint8_t rshift, gshift, bshift, ashift;
		uint8_t rmax, gmax, bmax, amax;
		uint8_t rbits, gbits, bbits, abits;
		} PixelFormat;

		PixelFormat qemu_pixelformat_from_pixman(pixman_format_code_t format);
		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);