mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

weston: Rename weston_output_init_pending() to weston_output_init()

Browse Source 
v2:

 - Rebased for latest changes.

v3:

 - Rebased for changes in wayland backend.

Reviewed-by: Quentin Glidic <sardemff7+git@sardemff7.net>
Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk>
Signed-off-by: Armin Krezović <krezovic.armin@gmail.com>
This commit is contained in:
Armin Krezović
2016-09-30 14:11:12 +02:00
committed by Pekka Paalanen
parent 782f5df9e3
commit 4008740d5e
8 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libweston/compositor-drm.c
+1 -1
View File
@@ -2563,7 +2563,7 @@ create_output_for_connector(struct drm_backend *b,
b->crtc_allocator |= (1 << output->crtc_id); b->crtc_allocator |= (1 << output->crtc_id);
b->connector_allocator |= (1 << output->connector_id); b->connector_allocator |= (1 << output->connector_id);
weston_output_init_pending(&output->base, b->compositor); weston_output_init(&output->base, b->compositor);
weston_compositor_add_pending_output(&output->base, b->compositor); weston_compositor_add_pending_output(&output->base, b->compositor);
return 0; return 0;
libweston/compositor-fbdev.c
+1 -1
View File
@@ -498,7 +498,7 @@ fbdev_output_create(struct fbdev_backend *backend,
output->base.disable = NULL; output->base.disable = NULL;
output->base.enable = fbdev_output_enable; output->base.enable = fbdev_output_enable;
weston_output_init_pending(&output->base, backend->compositor); weston_output_init(&output->base, backend->compositor);
/* only one static mode in list */ /* only one static mode in list */
output->mode.flags = output->mode.flags =
libweston/compositor-headless.c
+1 -1
View File
@@ -239,7 +239,7 @@ headless_output_create(struct weston_compositor *compositor,
output->base.disable = headless_output_disable; output->base.disable = headless_output_disable;
output->base.enable = headless_output_enable; output->base.enable = headless_output_enable;
weston_output_init_pending(&output->base, compositor); weston_output_init(&output->base, compositor);
weston_compositor_add_pending_output(&output->base, compositor); weston_compositor_add_pending_output(&output->base, compositor);
return 0; return 0;
libweston/compositor-rdp.c
+1 -1
View File
@@ -573,7 +573,7 @@ rdp_backend_create_output(struct weston_compositor *compositor)
output->base.disable = rdp_output_disable; output->base.disable = rdp_output_disable;
output->base.enable = rdp_output_enable; output->base.enable = rdp_output_enable;
weston_output_init_pending(&output->base, compositor); weston_output_init(&output->base, compositor);
weston_compositor_add_pending_output(&output->base, compositor); weston_compositor_add_pending_output(&output->base, compositor);
return 0; return 0;
libweston/compositor-wayland.c
+3 -3
View File
@@ -1155,7 +1155,7 @@ wayland_output_create(struct weston_compositor *compositor, const char *name)
output->base.name = strdup(name); output->base.name = strdup(name);
weston_output_init_pending(&output->base, compositor); weston_output_init(&output->base, compositor);
weston_compositor_add_pending_output(&output->base, compositor); weston_compositor_add_pending_output(&output->base, compositor);
return 0; return 0;
@@ -1242,7 +1242,7 @@ wayland_output_create_for_parent_output(struct wayland_backend *b,
goto out; goto out;
} }
weston_output_init_pending(&output->base, b->compositor); weston_output_init(&output->base, b->compositor);
output->base.scale = 1; output->base.scale = 1;
output->base.transform = WL_OUTPUT_TRANSFORM_NORMAL; output->base.transform = WL_OUTPUT_TRANSFORM_NORMAL;
@@ -1280,7 +1280,7 @@ wayland_output_create_fullscreen(struct wayland_backend *b)
output->base.name = strdup("wayland-fullscreen"); output->base.name = strdup("wayland-fullscreen");
weston_output_init_pending(&output->base, b->compositor); weston_output_init(&output->base, b->compositor);
output->base.scale = 1; output->base.scale = 1;
output->base.transform = WL_OUTPUT_TRANSFORM_NORMAL; output->base.transform = WL_OUTPUT_TRANSFORM_NORMAL;
libweston/compositor-x11.c
+1 -1
View File
@@ -1031,7 +1031,7 @@ x11_output_create(struct weston_compositor *compositor,
output->base.disable = x11_output_disable; output->base.disable = x11_output_disable;
output->base.enable = x11_output_enable; output->base.enable = x11_output_enable;
weston_output_init_pending(&output->base, compositor); weston_output_init(&output->base, compositor);
weston_compositor_add_pending_output(&output->base, compositor); weston_compositor_add_pending_output(&output->base, compositor);
return 0; return 0;
libweston/compositor.c
+3 -3
View File
@@ -4427,8 +4427,8 @@ weston_output_set_transform(struct weston_output *output,
* configured either by compositors or backends. * configured either by compositors or backends.
*/ */
WL_EXPORT void WL_EXPORT void
weston_output_init_pending(struct weston_output *output, weston_output_init(struct weston_output *output,
struct weston_compositor *compositor) struct weston_compositor *compositor)
{ {
output->compositor = compositor; output->compositor = compositor;
output->destroying = 0; output->destroying = 0;
@@ -4587,7 +4587,7 @@ weston_output_enable(struct weston_output *output)
* *
* \param output The weston_output object that needs to be disabled. * \param output The weston_output object that needs to be disabled.
* *
* See weston_output_init_pending() for more information on the * See weston_output_init() for more information on the
* state output is returned to. * state output is returned to.
* *
* Calls a backend specific function to disable an output, in case * Calls a backend specific function to disable an output, in case
libweston/compositor.h
+3 -5
View File
@@ -1611,9 +1611,7 @@ void
weston_output_update_matrix(struct weston_output *output); weston_output_update_matrix(struct weston_output *output);
void void
weston_output_move(struct weston_output *output, int x, int y); weston_output_move(struct weston_output *output, int x, int y);
void
weston_output_init(struct weston_output *output, struct weston_compositor *c,
int x, int y, int width, int height, uint32_t transform, int32_t scale);
void void
weston_compositor_add_output(struct weston_compositor *compositor, weston_compositor_add_output(struct weston_compositor *compositor,
struct weston_output *output); struct weston_output *output);
@@ -1830,8 +1828,8 @@ weston_output_set_transform(struct weston_output *output,
uint32_t transform); uint32_t transform);
void void
weston_output_init_pending(struct weston_output *output, weston_output_init(struct weston_output *output,
struct weston_compositor *compositor); struct weston_compositor *compositor);
void void
weston_compositor_add_pending_output(struct weston_output *output, weston_compositor_add_pending_output(struct weston_output *output,