frontend: Add common --renderer=foo argument

Rather than reinventing --use-pixman and --use-gl throughout each
backend, just have a common --renderer=foo argument which can be used to
explicitly specify the renderer.

The old arguments are still handled for backwards compatibility.

Signed-off-by: Daniel Stone <daniels@collabora.com>

2 files changed, 28 insertions, 2 deletions

diff --git a/man/weston.ini.man b/man/weston.ini.man
index 4f1141e1..48320857 100644
--- a/man/weston.ini.man
+++ b/man/weston.ini.man
@@ -188,7 +188,25 @@ directory are:
 .fi
 .RE
 .TP 7
+.BI "renderer=" auto
+Selects a renderer to use for internal composition when required, or
+.BI auto
+to select the most appropriate renderer. Available renderers are:
+.PP
+.RS 10
+.nf
+.BR auto
+.BR gl
+.BR noop
+.BR pixman
+.fi
+.RE
+Not all backends support all renderers.
+.TP 7
 .BI "use-pixman=" true
+Deprecated in favour of the
+.BI "renderer="
+option.
 Enables pixman-based rendering for all outputs on backends that support it.
 Boolean, defaults to
 .BR false .
diff --git a/man/weston.man b/man/weston.man
index 7c7bf914..3de1c8a9 100644
--- a/man/weston.man
+++ b/man/weston.man
@@ -185,6 +185,10 @@ Do not read
 for the compositor. Avoids e.g. loading compositor modules via the
 configuration file, which is useful for unit tests.
 .TP
+\fB\-\-renderer\fR=\fIrenderer\fR
+Select which renderer to use for Weston's internal composition. Defaults to
+automatic selection.
+.TP
 \fB\-\-shell\fR=\fIshell\fR
 Select which shell to load to provide Weston's user interface. See
 .BR ENVIRONMENT "."
@@ -236,7 +240,9 @@ Give all outputs a scale factor of
 .I N.
 .TP
 .B \-\-use\-pixman
-Use the pixman renderer.  By default, weston will try to use EGL and
+Deprecated in favour of the
+.BI \-\-renderer
+option.  Use the pixman renderer.  By default weston will try to use EGL and
 GLES2 for rendering and will fall back to the pixman-based renderer for
 software compositing if EGL cannot be used.  Passing this option will force
 weston to use the pixman renderer.
@@ -262,7 +268,9 @@ Give all outputs a scale factor of
 .I N.
 .TP
 .B \-\-use\-pixman
-Use the pixman renderer.  By default weston will try to use EGL and
+Deprecated in favour of the
+.BI \-\-renderer
+option.  Use the pixman renderer.  By default weston will try to use EGL and
 GLES2 for rendering.  Passing this option will make weston use the
 pixman library for software compsiting.
 .