And since weston_compositor structure now doesn't provide backend
field, move it to the parent ivi_compositor structure.
Bug-AGL: SPEC-5061
Change-Id: Ia0463ecdf149172c67857131530fc42e56fe5190
Signed-off-by: Denys Dmytriyenko <denys@konsulko.com>
bool force_pixman = false;
bool use_shadow;
bool without_input = false;
bool force_pixman = false;
bool use_shadow;
bool without_input = false;
const struct weston_option options[] = {
{ WESTON_OPTION_STRING, "seat", 0, &config.seat_id },
const struct weston_option options[] = {
{ WESTON_OPTION_STRING, "seat", 0, &config.seat_id },
if (without_input)
ivi->compositor->require_input = !without_input;
if (without_input)
ivi->compositor->require_input = !without_input;
- ret = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_DRM,
- &config.base);
- if (ret < 0)
- return ret;
+ if (!weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_DRM,
+ &config.base))
+ return -1;
ivi->drm_api = weston_drm_output_get_api(ivi->compositor);
if (!ivi->drm_api) {
weston_log("Cannot use drm output api.\n");
ivi->drm_api = weston_drm_output_get_api(ivi->compositor);
if (!ivi->drm_api) {
weston_log("Cannot use drm output api.\n");
error:
free(config.gbm_format);
free(config.seat_id);
error:
free(config.gbm_format);
free(config.seat_id);
- if (ivi->window_api->create_head(ivi->compositor->backend, output_name) < 0) {
+ if (ivi->window_api->create_head(ivi->backend, output_name) < 0) {
free(output_name);
return -1;
}
free(output_name);
return -1;
}
if (asprintf(&default_output, "%s%d", name_prefix, i) < 0)
return -1;
if (asprintf(&default_output, "%s%d", name_prefix, i) < 0)
return -1;
- if (ivi->window_api->create_head(ivi->compositor->backend, default_output) < 0) {
+ if (ivi->window_api->create_head(ivi->backend, default_output) < 0) {
free(default_output);
return -1;
}
free(default_output);
return -1;
}
int sprawl = 0;
int output_count;
bool force_pixman = false;
int sprawl = 0;
int output_count;
bool force_pixman = false;
const struct weston_option options[] = {
{ WESTON_OPTION_STRING, "display", 0, &config.display_name },
const struct weston_option options[] = {
{ WESTON_OPTION_STRING, "display", 0, &config.display_name },
weston_config_section_get_int(section, "cursor-size",
&config.cursor_size, 32);
weston_config_section_get_int(section, "cursor-size",
&config.cursor_size, 32);
- ret = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_WAYLAND,
- &config.base);
+ ivi->backend = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_WAYLAND,
+ &config.base);
free(config.cursor_theme);
free(config.display_name);
free(config.cursor_theme);
free(config.display_name);
- if (ret < 0)
- return ret;
+ if (!ivi->backend)
+ return -1;
ivi->window_api = weston_windowed_output_get_api(ivi->compositor);
ivi->window_api = weston_windowed_output_get_api(ivi->compositor);
}
#if !defined(BUILD_XWAYLAND)
}
#if !defined(BUILD_XWAYLAND)
wet_load_xwayland(struct weston_compositor *comp)
{
weston_log("Attempted to load xwayland library but compositor "
"was *not* built with xwayland support!\n");
wet_load_xwayland(struct weston_compositor *comp)
{
weston_log("Attempted to load xwayland library but compositor "
"was *not* built with xwayland support!\n");
goto error_compositor;
if (xwayland) {
goto error_compositor;
if (xwayland) {
- if (wet_load_xwayland(ivi.compositor) < 0)
+ if (!wet_load_xwayland(ivi.compositor))
struct ivi_compositor {
struct weston_compositor *compositor;
struct ivi_compositor {
struct weston_compositor *compositor;
+ struct weston_backend *backend;
struct weston_config *config;
struct ivi_output_config *parsed_options;
struct weston_config *config;
struct ivi_output_config *parsed_options;