compositor: Don't reuse weston_compositor_create_output

[src/agl-compositor.git] / src / compositor.c

diff --git a/src/compositor.c b/src/compositor.c
index 564c0ec..59c3d9f 100644 (file)
--- a/src/compositor.c
+++ b/src/compositor.c
@@ -1,5 +1,5 @@
 /*
- * Copyright © 2012-2021 Collabora, Ltd.
+ * Copyright © 2012-2024 Collabora, Ltd.
  *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
@@ -327,15 +327,15 @@ ivi_ensure_output(struct ivi_compositor *ivi, char *name,
        output->name = name;
        output->config = config;
 
-       if (ivi->simple_output_configure) {
-               output->output =
-                       weston_compositor_create_output(ivi->compositor, head, head->name);
-               if (!output->output) {
-                       free(output->name);
-                       free(output);
-                       return NULL;
-               }
+       output->output =
+               weston_compositor_create_output(ivi->compositor, head, head->name);
+       if (!output->output) {
+               free(output->name);
+               free(output);
+               return NULL;
+       }
 
+       if (ivi->simple_output_configure) {
                int ret = ivi->simple_output_configure(output->output);
                if (ret < 0) {
                        weston_log("Configuring output \"%s\" failed.\n",
@@ -352,15 +352,6 @@ ivi_ensure_output(struct ivi_compositor *ivi, char *name,
                        ivi->init_failed = true;
                        return NULL;
                }
-
-       } else {
-               output->output =
-                       weston_compositor_create_output(ivi->compositor, head, name);
-               if (!output->output) {
-                       free(output->name);
-                       free(output);
-                       return NULL;
-               }
        }
 
        output->output_destroy.notify = handle_output_destroy;
@@ -1324,6 +1315,7 @@ load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv,
        int output_count;
 
        struct weston_compositor *c = ivi->compositor;
+       struct weston_backend *wb = NULL;
 
        const struct weston_option options[] = {
                { WESTON_OPTION_BOOLEAN, "use-pixman", false, &force_pixman },
@@ -1360,7 +1352,11 @@ load_headless_backend(struct ivi_compositor *ivi, int *argc, char **argv,
                return -1;
        }
 
-       if (ivi->window_api->create_head(c->backend, "headless") < 0) {
+       wb = weston_compositor_load_backend(ivi->compositor, WESTON_BACKEND_HEADLESS, &config.base);
+       if (!wb)
+               return -1;
+
+       if (ivi->window_api->create_head(wb, "headless") < 0) {
                weston_log("Cannot create headless back-end\n");
                return -1;
        }
@@ -1404,6 +1400,7 @@ rdp_backend_output_configure(struct weston_output *output)
        struct weston_config_section *section;
        uint32_t transform = WL_OUTPUT_TRANSFORM_NORMAL;
        char *transform_string;
+       struct weston_mode new_mode = {};
 
        assert(parsed_options);
 
@@ -1440,13 +1437,12 @@ rdp_backend_output_configure(struct weston_output *output)
                return -1;
        }
 
-       weston_output_set_transform(output, transform);
 
-       if (api->output_set_size(output, width, height) < 0) {
-               weston_log("Cannot configure output \"%s\" using weston_rdp_output_api.\n",
-                               output->name);
-               return -1;
-       }
+       new_mode.width = width;
+       new_mode.height = height;
+
+       api->output_set_mode(output, &new_mode);
+       weston_output_set_transform(output, transform);
 
        return 0;
 }