compositor/main.c: use pixman renderer by default when gl-renderer not enabled
When the gl-renderer is not enabled, weston fails to start, as it doesn't automatically fallback to the pixman renderer, which is always enabled. This commit changes the drm-backend to set by default the --use-pixman option to true when the gl-renderer is disabled (BUILD_DRM_GBM is not defined). Signed-off-by: Thomas Petazzoni <thomas.petazzoni@bootlin.com>
This commit is contained in:
committed by
Daniel Stone
parent
6ee486ff95
commit
6e529cb6ab
+11
-1
@@ -2879,13 +2879,23 @@ load_drm_backend(struct weston_compositor *c,
|
|||||||
struct weston_config_section *section;
|
struct weston_config_section *section;
|
||||||
struct wet_compositor *wet = to_wet_compositor(c);
|
struct wet_compositor *wet = to_wet_compositor(c);
|
||||||
bool without_input = false;
|
bool without_input = false;
|
||||||
|
bool use_pixman_default;
|
||||||
int ret = 0;
|
int ret = 0;
|
||||||
|
|
||||||
wet->drm_use_current_mode = false;
|
wet->drm_use_current_mode = false;
|
||||||
|
|
||||||
section = weston_config_get_section(wc, "core", NULL, NULL);
|
section = weston_config_get_section(wc, "core", NULL, NULL);
|
||||||
|
|
||||||
|
/* Use the pixman renderer by default when GBM/EGL support is
|
||||||
|
* not enabled */
|
||||||
|
#if defined(BUILD_DRM_GBM)
|
||||||
|
use_pixman_default = false;
|
||||||
|
#else
|
||||||
|
use_pixman_default = true;
|
||||||
|
#endif
|
||||||
|
|
||||||
weston_config_section_get_bool(section, "use-pixman", &config.use_pixman,
|
weston_config_section_get_bool(section, "use-pixman", &config.use_pixman,
|
||||||
false);
|
use_pixman_default);
|
||||||
|
|
||||||
const struct weston_option options[] = {
|
const struct weston_option options[] = {
|
||||||
{ WESTON_OPTION_STRING, "seat", 0, &config.seat_id },
|
{ WESTON_OPTION_STRING, "seat", 0, &config.seat_id },
|
||||||
|
|||||||
Reference in New Issue
Block a user