|
 |
9ae3a8 |
From df989559119707094b17269d025bcdf83df765f1 Mon Sep 17 00:00:00 2001
|
|
|
9ae3a8 |
From: Tarun Gupta <tgupta@redhat.com>
|
|
|
9ae3a8 |
Date: Wed, 20 Jun 2018 18:54:17 +0200
|
|
|
9ae3a8 |
Subject: [PATCH 09/17] ui/pixman: add qemu_drm_format_to_pixman()
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
RH-Author: Tarun Gupta <tgupta@redhat.com>
|
|
|
9ae3a8 |
Message-id: <1529520865-18127-4-git-send-email-tgupta@redhat.com>
|
|
|
9ae3a8 |
Patchwork-id: 80911
|
|
|
9ae3a8 |
O-Subject: [RHEL7.6 qemu-kvm PATCH v3 03/11] ui/pixman: add qemu_drm_format_to_pixman()
|
|
|
9ae3a8 |
Bugzilla: 1555246
|
|
|
9ae3a8 |
RH-Acked-by: Alex Williamson <alex.williamson@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
RH-Acked-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Map drm fourcc codes to pixman formats.
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Gerd Hoffmann <kraxel@redhat.com>
|
|
|
9ae3a8 |
Reviewed by: Kirti Wankhede <kwankhede@nvidia.com>
|
|
|
9ae3a8 |
Signed-off-by: Alex Williamson <alex.williamson@redhat.com>
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
(cherry picked from a5127bd73f77b90b50d63014be10cef467c1c3f9)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
Signed-off-by: Miroslav Rezanina <mrezanin@redhat.com>
|
|
|
9ae3a8 |
---
|
|
|
9ae3a8 |
include/ui/qemu-pixman.h | 6 ++++++
|
|
|
9ae3a8 |
ui/qemu-pixman.c | 22 ++++++++++++++++++++++
|
|
|
9ae3a8 |
2 files changed, 28 insertions(+)
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
diff --git a/include/ui/qemu-pixman.h b/include/ui/qemu-pixman.h
|
|
|
9ae3a8 |
index 500725c..8deb008 100644
|
|
|
9ae3a8 |
--- a/include/ui/qemu-pixman.h
|
|
|
9ae3a8 |
+++ b/include/ui/qemu-pixman.h
|
|
|
9ae3a8 |
@@ -27,9 +27,13 @@
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
#ifdef HOST_WORDS_BIGENDIAN
|
|
|
9ae3a8 |
# define PIXMAN_BE_r8g8b8 PIXMAN_r8g8b8
|
|
|
9ae3a8 |
+# define PIXMAN_LE_r8g8b8 PIXMAN_b8g8r8
|
|
|
9ae3a8 |
+# define PIXMAN_LE_a8r8g8b8 PIXMAN_b8g8r8a8
|
|
|
9ae3a8 |
# define PIXMAN_LE_x8r8g8b8 PIXMAN_b8g8r8x8
|
|
|
9ae3a8 |
#else
|
|
|
9ae3a8 |
# define PIXMAN_BE_r8g8b8 PIXMAN_b8g8r8
|
|
|
9ae3a8 |
+# define PIXMAN_LE_r8g8b8 PIXMAN_r8g8b8
|
|
|
9ae3a8 |
+# define PIXMAN_LE_a8r8g8b8 PIXMAN_a8r8g8b8
|
|
|
9ae3a8 |
# define PIXMAN_LE_x8r8g8b8 PIXMAN_x8r8g8b8
|
|
|
9ae3a8 |
#endif
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
@@ -46,6 +50,8 @@ pixman_image_t *qemu_pixman_mirror_create(pixman_format_code_t format,
|
|
|
9ae3a8 |
pixman_image_t *image);
|
|
|
9ae3a8 |
void qemu_pixman_image_unref(pixman_image_t *image);
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
+pixman_format_code_t qemu_drm_format_to_pixman(uint32_t drm_format);
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
pixman_color_t qemu_pixman_color(PixelFormat *pf, uint32_t color);
|
|
|
9ae3a8 |
pixman_image_t *qemu_pixman_glyph_from_vgafont(int height, const uint8_t *font,
|
|
|
9ae3a8 |
unsigned int ch);
|
|
|
9ae3a8 |
diff --git a/ui/qemu-pixman.c b/ui/qemu-pixman.c
|
|
|
9ae3a8 |
index 254bd8c..4be422c 100644
|
|
|
9ae3a8 |
--- a/ui/qemu-pixman.c
|
|
|
9ae3a8 |
+++ b/ui/qemu-pixman.c
|
|
|
9ae3a8 |
@@ -5,6 +5,28 @@
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
#include "qemu-common.h"
|
|
|
9ae3a8 |
#include "ui/console.h"
|
|
|
9ae3a8 |
+#include "drm_fourcc.h"
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+/* Note: drm is little endian, pixman is native endian */
|
|
|
9ae3a8 |
+pixman_format_code_t qemu_drm_format_to_pixman(uint32_t drm_format)
|
|
|
9ae3a8 |
+{
|
|
|
9ae3a8 |
+ static const struct {
|
|
|
9ae3a8 |
+ uint32_t drm_format;
|
|
|
9ae3a8 |
+ pixman_format_code_t pixman;
|
|
|
9ae3a8 |
+ } map[] = {
|
|
|
9ae3a8 |
+ { DRM_FORMAT_RGB888, PIXMAN_LE_r8g8b8 },
|
|
|
9ae3a8 |
+ { DRM_FORMAT_ARGB8888, PIXMAN_LE_a8r8g8b8 },
|
|
|
9ae3a8 |
+ { DRM_FORMAT_XRGB8888, PIXMAN_LE_x8r8g8b8 }
|
|
|
9ae3a8 |
+ };
|
|
|
9ae3a8 |
+ int i;
|
|
|
9ae3a8 |
+
|
|
|
9ae3a8 |
+ for (i = 0; i < ARRAY_SIZE(map); i++) {
|
|
|
9ae3a8 |
+ if (drm_format == map[i].drm_format) {
|
|
|
9ae3a8 |
+ return map[i].pixman;
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+ }
|
|
|
9ae3a8 |
+ return 0;
|
|
|
9ae3a8 |
+}
|
|
|
9ae3a8 |
|
|
|
9ae3a8 |
int qemu_pixman_get_type(int rshift, int gshift, int bshift)
|
|
|
9ae3a8 |
{
|
|
|
9ae3a8 |
--
|
|
|
9ae3a8 |
1.8.3.1
|
|
|
9ae3a8 |
|