[PATCH weston] compositor-drm: Allow ARGB8888 as a GBM format

Derek Foreman derekf at osg.samsung.com
Thu Mar 19 13:16:14 PDT 2015


As of mesa commit 65c8965d on some systems all formats that used to
be called XRGB8888 are now ARGB8888 and we can't launch weston.

This allows setting ARGB8888 as a format in weston.ini (but does not
change the default)

Signed-off-by: Derek Foreman <derekf at osg.samsung.com>
---
 man/weston.ini.man   | 1 +
 src/compositor-drm.c | 2 ++
 2 files changed, 3 insertions(+)

diff --git a/man/weston.ini.man b/man/weston.ini.man
index 7a353c9..4d2b1c0 100644
--- a/man/weston.ini.man
+++ b/man/weston.ini.man
@@ -139,6 +139,7 @@ directory are:
 .TP 7
 .BI "gbm-format="format
 sets the GBM format used for the framebuffer for the GBM backend. Can be
+.B argb8888,
 .B xrgb8888,
 .B xrgb2101010,
 .B rgb565.
diff --git a/src/compositor-drm.c b/src/compositor-drm.c
index ed4eabf..b6ea8b8 100644
--- a/src/compositor-drm.c
+++ b/src/compositor-drm.c
@@ -1917,6 +1917,8 @@ get_gbm_format_from_section(struct weston_config_section *section,
 
 	if (s == NULL)
 		*format = default_value;
+	else if (strcmp(s, "argb8888") == 0)
+		*format = GBM_FORMAT_ARGB8888;
 	else if (strcmp(s, "xrgb8888") == 0)
 		*format = GBM_FORMAT_XRGB8888;
 	else if (strcmp(s, "rgb565") == 0)
-- 
2.1.4



More information about the wayland-devel mailing list