[PATCH weston v7 1/3] x11: port the x11 backend to the new init api

Bryce Harrington bryce at osg.samsung.com
Tue May 3 08:28:16 UTC 2016


On Sat, Apr 30, 2016 at 10:32:59AM +0200, Benoit Gschwind wrote:
> Hello Bryce,
> 
> It's look the you use space within Makefile.am instead of tabulation.
> 
> Le 30/04/2016 10:30, Benoit Gschwind a écrit :
> > Hello Bryce,
> > 
> > It look good after trivial rebase to master.
> > 
> > Reviewed-by: Benoit Gschwind <gschwind at gnu-log.net>
> > Tested-by: Benoit Gschwind <gschwind at gnu-log.net>

I've gone ahead and pushed this one, with the whitespace fix, to get it
off the list.

Bryce

> > Le 30/04/2016 00:40, Bryce Harrington a écrit :
> >> From: Benoit Gschwind <gschwind at gnu-log.net>
> >>
> >> Use a "well" defined structure to configure x11-backend and move configuration
> >> file parsing inside the weston compositor code.
> >>
> >> Enforce destruction of all backend config objects after initialization.
> >> Since the backend config struct versioning implies that there we expect
> >> potential future descrepancy between main's definition of the config
> >> object and the backend's, don't allow the backend to hang onto the
> >> config object outside the initialization scope.
> >>
> >> Signed-off-by: Bryce Harrington <bryce at osg.samsung.com>
> >> Reviewed-by: Giulio Camuffo <giuliocamuffo at gmail.com>
> >> Reviewed-by: Pekka Paalanen <pekka.paalanen at collabora.co.uk>
> >> ---
> >>
> >> v5:
> >>   - Update to current trunk
> >>   - Reformated for style consistency (e.g. spaces in "if(",
> >>     linebreaks, etc.)
> >>   - Move variable declarations to top of block
> >>   - Rename header guard for consistency with other headers
> >>   - Other misc. code style formatting fixes
> >>   - Adjust code style to better match drm backend config
> >>   - Version the config struct
> >>   - Dropped use of bzero in favor of zalloc
> >>   - Don't initialize vars already zalloc'd
> >>   - Dropped weston_x11_backend_load in favor of more general
> >>   	load_backend_new routine
> >>   - Dropped weston_x11_backend_config_outputs_clear and just free
> >>   	outputs in error handler for init routine
> >>   - Dropped some temp variables for output configuration
> >>   - Restore use of 'backend_init' as module entrypoint
> >>   - Rename 'ths' to 'config' for backend config structs
> >>   - Rename 'x11_options' to 'options' for consistency
> >>   - Rename other variables for consistency with other code
> >>   - Rename 'noutputs' to 'num_outputs'
> >> v6:
> >>   - Define version number in the header
> >>   - Don't use initial underscores in header guards
> >>   - Add stub config_init_to_defaults()
> >>   - Allocate config on stack
> >>   - Install compositor-x11.h and list it in x11-backend sources
> >>   - Fail if invalid width or height given for an output.  It's the
> >>     caller's job to ensure the values are valid when parsing weston.ini
> >>     and the command line options.
> >>   - Preserve preference for height/width passed as options
> >> v7:
> >>   - Rebase to master
> >>   - Put backend configs on stack instead of zalloc()
> >>   - Enforce destruction of backend config object after initialization
> >>   - Ensure default_output.name is freed
> >>
> >>  Makefile.am          |   3 +
> >>  src/compositor-x11.c | 158 ++++++++++++++++++---------------------------------
> >>  src/compositor-x11.h |  62 ++++++++++++++++++++
> >>  src/main.c           | 144 +++++++++++++++++++++++++++++++++++++++++++++-
> >>  4 files changed, 263 insertions(+), 104 deletions(-)
> >>  create mode 100644 src/compositor-x11.h
> >>
> >> diff --git a/Makefile.am b/Makefile.am
> >> index 2d72730..f0590cd 100644
> >> --- a/Makefile.am
> >> +++ b/Makefile.am
> >> @@ -73,6 +73,7 @@ weston_SOURCES =					\
> >>  	src/compositor.c				\
> >>  	src/compositor.h				\
> >>  	src/compositor-headless.h		\
> >> +	src/compositor-x11.h            \
> >>  	src/compositor-rdp.h				\
> >>  	src/input.c					\
> >>  	src/data-device.c				\
> >> @@ -211,6 +212,7 @@ westoninclude_HEADERS =				\
> >>  	src/version.h				\
> >>  	src/compositor.h			\
> >>  	src/compositor-headless.h		\
> >> +	src/compositor-x11.h			\
> >>  	src/compositor-rdp.h			\
> >>  	src/timeline-object.h			\
> >>  	shared/matrix.h				\
> >> @@ -254,6 +256,7 @@ x11_backend_la_CFLAGS =				\
> >>  	$(AM_CFLAGS)
> >>  x11_backend_la_SOURCES = 			\
> >>  	src/compositor-x11.c			\
> >> +	src/compositor-x11.h			\
> >>  	shared/helpers.h
> >>  endif
> >>  
> >> diff --git a/src/compositor-x11.c b/src/compositor-x11.c
> >> index 91a7c2e..629b5f3 100644
> >> --- a/src/compositor-x11.c
> >> +++ b/src/compositor-x11.c
> >> @@ -50,21 +50,17 @@
> >>  #include <xkbcommon/xkbcommon.h>
> >>  
> >>  #include "compositor.h"
> >> -#include "gl-renderer.h"
> >> -#include "pixman-renderer.h"
> >> +#include "compositor-x11.h"
> >>  #include "shared/config-parser.h"
> >>  #include "shared/helpers.h"
> >>  #include "shared/image-loader.h"
> >> +#include "gl-renderer.h"
> >> +#include "pixman-renderer.h"
> >>  #include "presentation-time-server-protocol.h"
> >>  #include "linux-dmabuf.h"
> >>  
> >>  #define DEFAULT_AXIS_STEP_DISTANCE 10
> >>  
> >> -static int option_width;
> >> -static int option_height;
> >> -static int option_scale;
> >> -static int option_count;
> >> -
> >>  struct x11_backend {
> >>  	struct weston_backend	 base;
> >>  	struct weston_compositor *compositor;
> >> @@ -1566,25 +1562,16 @@ init_gl_renderer(struct x11_backend *b)
> >>  
> >>  	return ret;
> >>  }
> >> +
> >>  static struct x11_backend *
> >>  x11_backend_create(struct weston_compositor *compositor,
> >> -		   int fullscreen,
> >> -		   int no_input,
> >> -		   int use_pixman,
> >> -		   int *argc, char *argv[],
> >> -		   struct weston_config *config)
> >> +		   struct weston_x11_backend_config *config)
> >>  {
> >>  	struct x11_backend *b;
> >>  	struct x11_output *output;
> >>  	struct wl_event_loop *loop;
> >> -	struct weston_config_section *section;
> >> -	int i, x = 0, output_count = 0;
> >> -	int width, height, scale, count;
> >> -	const char *section_name;
> >> -	char *name, *t, *mode;
> >> -	uint32_t transform;
> >> -
> >> -	weston_log("initializing x11 backend\n");
> >> +	int x = 0;
> >> +	unsigned i;
> >>  
> >>  	b = zalloc(sizeof *b);
> >>  	if (b == NULL)
> >> @@ -1610,13 +1597,13 @@ x11_backend_create(struct weston_compositor *compositor,
> >>  	x11_backend_get_resources(b);
> >>  	x11_backend_get_wm_info(b);
> >>  
> >> -	if (!b->has_net_wm_state_fullscreen && fullscreen) {
> >> +	if (!b->has_net_wm_state_fullscreen && config->fullscreen) {
> >>  		weston_log("Can not fullscreen without window manager support"
> >>  			   "(need _NET_WM_STATE_FULLSCREEN)\n");
> >> -		fullscreen = 0;
> >> +		config->fullscreen = 0;
> >>  	}
> >>  
> >> -	b->use_pixman = use_pixman;
> >> +	b->use_pixman = config->use_pixman;
> >>  	if (b->use_pixman) {
> >>  		if (pixman_renderer_init(compositor) < 0) {
> >>  			weston_log("Failed to initialize pixman renderer for X11 backend\n");
> >> @@ -1626,83 +1613,51 @@ x11_backend_create(struct weston_compositor *compositor,
> >>  	else if (init_gl_renderer(b) < 0) {
> >>  		goto err_xdisplay;
> >>  	}
> >> -	weston_log("Using %s renderer\n", use_pixman ? "pixman" : "gl");
> >> +	weston_log("Using %s renderer\n", config->use_pixman ? "pixman" : "gl");
> >>  
> >>  	b->base.destroy = x11_destroy;
> >>  	b->base.restore = x11_restore;
> >>  
> >> -	if (x11_input_create(b, no_input) < 0) {
> >> +	if (x11_input_create(b, config->no_input) < 0) {
> >>  		weston_log("Failed to create X11 input\n");
> >>  		goto err_renderer;
> >>  	}
> >>  
> >> -	width = option_width ? option_width : 1024;
> >> -	height = option_height ? option_height : 640;
> >> -	scale = option_scale ? option_scale : 1;
> >> -	count = option_count ? option_count : 1;
> >> +	for (i = 0; i < config->num_outputs; ++i) {
> >> +		struct weston_x11_backend_output_config *output_iterator =
> >> +			&config->outputs[i];
> >>  
> >> -	section = NULL;
> >> -	while (weston_config_next_section(config,
> >> -					  &section, &section_name)) {
> >> -		if (strcmp(section_name, "output") != 0)
> >> -			continue;
> >> -		weston_config_section_get_string(section, "name", &name, NULL);
> >> -		if (name == NULL || name[0] != 'X') {
> >> -			free(name);
> >> +		if (output_iterator->name == NULL) {
> >>  			continue;
> >>  		}
> >>  
> >> -		weston_config_section_get_string(section,
> >> -						 "mode", &mode, "1024x600");
> >> -		if (sscanf(mode, "%dx%d", &width, &height) != 2) {
> >> -			weston_log("Invalid mode \"%s\" for output %s\n",
> >> -				   mode, name);
> >> -			width = 1024;
> >> -			height = 600;
> >> -		}
> >> -		free(mode);
> >> -
> >> -		if (option_width)
> >> -			width = option_width;
> >> -		if (option_height)
> >> -			height = option_height;
> >> -
> >> -		weston_config_section_get_int(section, "scale", &scale, 1);
> >> -		if (option_scale)
> >> -			scale = option_scale;
> >> -
> >> -		weston_config_section_get_string(section,
> >> -						 "transform", &t, "normal");
> >> -		if (weston_parse_transform(t, &transform) < 0)
> >> -			weston_log("Invalid transform \"%s\" for output %s\n",
> >> -				   t, name);
> >> -		free(t);
> >> -
> >> -		output = x11_backend_create_output(b, x, 0,
> >> -						   width, height,
> >> -						   fullscreen, no_input,
> >> -						   name, transform, scale);
> >> -		free(name);
> >> -		if (output == NULL) {
> >> -			weston_log("Failed to create configured x11 output\n");
> >> +		if (output_iterator->width < 1) {
> >> +			weston_log("Invalid width \"%d\" for output %s\n",
> >> +				   output_iterator->width, output_iterator->name);
> >>  			goto err_x11_input;
> >>  		}
> >>  
> >> -		x = pixman_region32_extents(&output->base.region)->x2;
> >> -
> >> -		output_count++;
> >> -		if (option_count && output_count >= option_count)
> >> -			break;
> >> -	}
> >> +		if (output_iterator->height < 1) {
> >> +			weston_log("Invalid height \"%d\" for output %s\n",
> >> +				   output_iterator->height, output_iterator->name);
> >> +			goto err_x11_input;
> >> +		}
> >>  
> >> -	for (i = output_count; i < count; i++) {
> >> -		output = x11_backend_create_output(b, x, 0, width, height,
> >> -						   fullscreen, no_input, NULL,
> >> -						   WL_OUTPUT_TRANSFORM_NORMAL, scale);
> >> +		output = x11_backend_create_output(b,
> >> +						   x,
> >> +						   0,
> >> +						   output_iterator->width,
> >> +						   output_iterator->height,
> >> +						   config->fullscreen,
> >> +						   config->no_input,
> >> +						   output_iterator->name,
> >> +						   output_iterator->transform,
> >> +						   output_iterator->scale);
> >>  		if (output == NULL) {
> >> -			weston_log("Failed to create x11 output #%d\n", i);
> >> +			weston_log("Failed to create configured x11 output\n");
> >>  			goto err_x11_input;
> >>  		}
> >> +
> >>  		x = pixman_region32_extents(&output->base.region)->x2;
> >>  	}
> >>  
> >> @@ -1735,34 +1690,33 @@ err_free:
> >>  	return NULL;
> >>  }
> >>  
> >> +static void
> >> +config_init_to_defaults(struct weston_x11_backend_config *config)
> >> +{
> >> +}
> >> +
> >>  WL_EXPORT int
> >> -backend_init(struct weston_compositor *compositor, int *argc, char *argv[],
> >> -	     struct weston_config *config,
> >> +backend_init(struct weston_compositor *compositor,
> >> +	     int *argc, char *argv[],
> >> +	     struct weston_config *wc,
> >>  	     struct weston_backend_config *config_base)
> >>  {
> >>  	struct x11_backend *b;
> >> -	int fullscreen = 0;
> >> -	int no_input = 0;
> >> -	int use_pixman = 0;
> >> -
> >> -	const struct weston_option x11_options[] = {
> >> -		{ WESTON_OPTION_INTEGER, "width", 0, &option_width },
> >> -		{ WESTON_OPTION_INTEGER, "height", 0, &option_height },
> >> -		{ WESTON_OPTION_INTEGER, "scale", 0, &option_scale },
> >> -		{ WESTON_OPTION_BOOLEAN, "fullscreen", 'f', &fullscreen },
> >> -		{ WESTON_OPTION_INTEGER, "output-count", 0, &option_count },
> >> -		{ WESTON_OPTION_BOOLEAN, "no-input", 0, &no_input },
> >> -		{ WESTON_OPTION_BOOLEAN, "use-pixman", 0, &use_pixman },
> >> -	};
> >> +	struct weston_x11_backend_config config = {{ 0, }};
> >>  
> >> -	parse_options(x11_options, ARRAY_LENGTH(x11_options), argc, argv);
> >> +	if (config_base == NULL ||
> >> +	    config_base->struct_version != WESTON_X11_BACKEND_CONFIG_VERSION ||
> >> +	    config_base->struct_size > sizeof(struct weston_x11_backend_config)) {
> >> +		weston_log("X11 backend config structure is invalid\n");
> >> +		return -1;
> >> +	}
> >> +
> >> +	config_init_to_defaults(&config);
> >> +	memcpy(&config, config_base, config_base->struct_size);
> >>  
> >> -	b = x11_backend_create(compositor,
> >> -			       fullscreen,
> >> -			       no_input,
> >> -			       use_pixman,
> >> -			       argc, argv, config);
> >> +	b = x11_backend_create(compositor, &config);
> >>  	if (b == NULL)
> >>  		return -1;
> >> +
> >>  	return 0;
> >>  }
> >> diff --git a/src/compositor-x11.h b/src/compositor-x11.h
> >> new file mode 100644
> >> index 0000000..8363a76
> >> --- /dev/null
> >> +++ b/src/compositor-x11.h
> >> @@ -0,0 +1,62 @@
> >> +/*
> >> + * Copyright © 2016 Benoit Gschwind
> >> + *
> >> + * Permission is hereby granted, free of charge, to any person obtaining
> >> + * a copy of this software and associated documentation files (the
> >> + * "Software"), to deal in the Software without restriction, including
> >> + * without limitation the rights to use, copy, modify, merge, publish,
> >> + * distribute, sublicense, and/or sell copies of the Software, and to
> >> + * permit persons to whom the Software is furnished to do so, subject to
> >> + * the following conditions:
> >> + *
> >> + * The above copyright notice and this permission notice (including the
> >> + * next paragraph) shall be included in all copies or substantial
> >> + * portions of the Software.
> >> + *
> >> + * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
> >> + * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
> >> + * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
> >> + * NONINFRINGEMENT.  IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS
> >> + * BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN
> >> + * ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
> >> + * CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
> >> + * SOFTWARE.
> >> + */
> >> +
> >> +#ifndef WESTON_COMPOSITOR_X11_H
> >> +#define WESTON_COMPOSITOR_X11_H
> >> +
> >> +#ifdef  __cplusplus
> >> +extern "C" {
> >> +#endif
> >> +
> >> +#include "compositor.h"
> >> +
> >> +#define WESTON_X11_BACKEND_CONFIG_VERSION 1
> >> +
> >> +struct weston_x11_backend_output_config {
> >> +	int width;
> >> +	int height;
> >> +	char *name;
> >> +	uint32_t transform;
> >> +	int32_t scale;
> >> +};
> >> +
> >> +struct weston_x11_backend_config {
> >> +	struct weston_backend_config base;
> >> +
> >> +	bool fullscreen;
> >> +	bool no_input;
> >> +
> >> +	/** Whether to use the pixman renderer instead of the OpenGL ES renderer. */
> >> +	bool use_pixman;
> >> +
> >> +	uint32_t num_outputs;
> >> +	struct weston_x11_backend_output_config *outputs;
> >> +};
> >> +
> >> +#ifdef  __cplusplus
> >> +}
> >> +#endif
> >> +
> >> +#endif /* WESTON_COMPOSITOR_X11_H_ */
> >> diff --git a/src/main.c b/src/main.c
> >> index f034dda..c012b6e 100644
> >> --- a/src/main.c
> >> +++ b/src/main.c
> >> @@ -49,6 +49,7 @@
> >>  
> >>  #include "compositor-headless.h"
> >>  #include "compositor-rdp.h"
> >> +#include "compositor-x11.h"
> >>  
> >>  static struct wl_list child_process_list;
> >>  static struct weston_compositor *segv_compositor;
> >> @@ -768,6 +769,145 @@ load_rdp_backend(struct weston_compositor *c, char const * backend,
> >>  }
> >>  
> >>  static int
> >> +weston_x11_backend_config_append_output_config(struct weston_x11_backend_config *config,
> >> +					       struct weston_x11_backend_output_config *output_config) {
> >> +	struct weston_x11_backend_output_config *new_outputs;
> >> +
> >> +	new_outputs = realloc(config->outputs, (config->num_outputs+1) *
> >> +			      sizeof(struct weston_x11_backend_output_config));
> >> +	if (new_outputs == NULL)
> >> +		return -1;
> >> +
> >> +	config->outputs = new_outputs;
> >> +	config->outputs[config->num_outputs].width = output_config->width;
> >> +	config->outputs[config->num_outputs].height = output_config->height;
> >> +	config->outputs[config->num_outputs].transform = output_config->transform;
> >> +	config->outputs[config->num_outputs].scale = output_config->scale;
> >> +	config->outputs[config->num_outputs].name = strdup(output_config->name);
> >> +	config->num_outputs++;
> >> +
> >> +	return 0;
> >> +}
> >> +
> >> +static int
> >> +load_x11_backend(struct weston_compositor *c, char const * backend,
> >> +		 int *argc, char **argv, struct weston_config *wc)
> >> +{
> >> +	struct weston_x11_backend_output_config default_output;
> >> +	struct weston_x11_backend_config config = {{ 0, }};
> >> +	struct weston_config_section *section;
> >> +	int ret = 0;
> >> +	int option_width = 0;
> >> +	int option_height = 0;
> >> +	int option_scale = 0;
> >> +	int option_count = 1;
> >> +	int output_count = 0;
> >> +	char const *section_name;
> >> +	int i;
> >> +	uint32_t j;
> >> +
> >> +	const struct weston_option options[] = {
> >> +	       { WESTON_OPTION_INTEGER, "width", 0, &option_width },
> >> +	       { WESTON_OPTION_INTEGER, "height", 0, &option_height },
> >> +	       { WESTON_OPTION_INTEGER, "scale", 0, &option_scale },
> >> +	       { WESTON_OPTION_BOOLEAN, "fullscreen", 'f', &config.fullscreen },
> >> +	       { WESTON_OPTION_INTEGER, "output-count", 0, &option_count },
> >> +	       { WESTON_OPTION_BOOLEAN, "no-input", 0, &config.no_input },
> >> +	       { WESTON_OPTION_BOOLEAN, "use-pixman", 0, &config.use_pixman },
> >> +	};
> >> +
> >> +	parse_options(options, ARRAY_LENGTH(options), argc, argv);
> >> +
> >> +	section = NULL;
> >> +	while (weston_config_next_section(wc, &section, &section_name)) {
> >> +		struct weston_x11_backend_output_config current_output = { 0, };
> >> +		char *t;
> >> +		char *mode;
> >> +
> >> +		if (strcmp(section_name, "output") != 0) {
> >> +			continue;
> >> +		}
> >> +
> >> +		weston_config_section_get_string(section, "name", &current_output.name, NULL);
> >> +		if (current_output.name == NULL || current_output.name[0] != 'X') {
> >> +			free(current_output.name);
> >> +			continue;
> >> +		}
> >> +
> >> +		weston_config_section_get_string(section, "mode", &mode, "1024x600");
> >> +		if (sscanf(mode, "%dx%d", &current_output.width,
> >> +			   &current_output.height) != 2) {
> >> +			weston_log("Invalid mode \"%s\" for output %s\n",
> >> +				   mode, current_output.name);
> >> +			current_output.width = 1024;
> >> +			current_output.height = 600;
> >> +		}
> >> +		free(mode);
> >> +		if (current_output.width < 1)
> >> +			current_output.width = 1024;
> >> +		if (current_output.height < 1)
> >> +			current_output.height = 600;
> >> +		if (option_width)
> >> +			current_output.width = option_width;
> >> +		if (option_height)
> >> +			current_output.height = option_height;
> >> +
> >> +		weston_config_section_get_int(section, "scale", &current_output.scale, 1);
> >> +		if (option_scale)
> >> +			current_output.scale = option_scale;
> >> +
> >> +		weston_config_section_get_string(section,
> >> +						 "transform", &t, "normal");
> >> +		if (weston_parse_transform(t, &current_output.transform) < 0)
> >> +			weston_log("Invalid transform \"%s\" for output %s\n",
> >> +				   t, current_output.name);
> >> +		free(t);
> >> +
> >> +		if (weston_x11_backend_config_append_output_config(&config, &current_output) < 0) {
> >> +			ret = -1;
> >> +			goto out;
> >> +		}
> >> +
> >> +		output_count++;
> >> +		if (option_count && output_count >= option_count)
> >> +			break;
> >> +	}
> >> +
> >> +	default_output.name = NULL;
> >> +	default_output.width = option_width ? option_width : 1024;
> >> +	default_output.height = option_height ? option_height : 600;
> >> +	default_output.scale = option_scale ? option_scale : 1;
> >> +	default_output.transform = WL_OUTPUT_TRANSFORM_NORMAL;
> >> +
> >> +	for (i = output_count; i < option_count; i++) {
> >> +		if (asprintf(&default_output.name, "screen%d", i) < 0) {
> >> +			ret = -1;
> >> +			goto out;
> >> +		}
> >> +
> >> +		if (weston_x11_backend_config_append_output_config(&config, &default_output) < 0) {
> >> +			ret = -1;
> >> +			free(default_output.name);
> >> +			goto out;
> >> +		}
> >> +		free(default_output.name);
> >> +	}
> >> +
> >> +	config.base.struct_version = WESTON_X11_BACKEND_CONFIG_VERSION;
> >> +	config.base.struct_size = sizeof(struct weston_x11_backend_config);
> >> +
> >> +	/* load the actual backend and configure it */
> >> +	ret = load_backend_new(c, backend, &config.base);
> >> +
> >> +out:
> >> +	for (j = 0; j < config.num_outputs; ++j)
> >> +		free(config.outputs[j].name);
> >> +	free(config.outputs);
> >> +
> >> +	return ret;
> >> +}
> >> +
> >> +static int
> >>  load_backend(struct weston_compositor *compositor, const char *backend,
> >>  	     int *argc, char **argv, struct weston_config *config)
> >>  {
> >> @@ -775,13 +915,13 @@ load_backend(struct weston_compositor *compositor, const char *backend,
> >>  		return load_headless_backend(compositor, backend, argc, argv, config);
> >>  	else if (strstr(backend, "rdp-backend.so"))
> >>  		return load_rdp_backend(compositor, backend, argc, argv, config);
> >> +	else if (strstr(backend, "x11-backend.so"))
> >> +		return load_x11_backend(compositor, backend, argc, argv, config);
> >>  #if 0
> >>  	else if (strstr(backend, "drm-backend.so"))
> >>  		return load_drm_backend(compositor, backend, argc, argv, config);
> >>  	else if (strstr(backend, "wayland-backend.so"))
> >>  		return load_wayland_backend(compositor, backend, argc, argv, config);
> >> -	else if (strstr(backend, "x11-backend.so"))
> >> -		return load_x11_backend(compositor, backend, argc, argv, config);
> >>  	else if (strstr(backend, "fbdev-backend.so"))
> >>  		return load_fbdev_backend(compositor, backend, argc, argv, config);
> >>  	else if (strstr(backend, "rpi-backend.so"))
> >>
> > _______________________________________________
> > wayland-devel mailing list
> > wayland-devel at lists.freedesktop.org
> > https://lists.freedesktop.org/mailman/listinfo/wayland-devel
> > 
> _______________________________________________
> wayland-devel mailing list
> wayland-devel at lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/wayland-devel


More information about the wayland-devel mailing list