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

libweston: move pixman_renderer_init() into weston_compositor_init_renderer()

Browse Source 
Stop calling pixman_renderer_init() from backends directly.
Call it via weston_compositor_init_renderer() instead.

Signed-off-by: Philipp Zabel <p.zabel@pengutronix.de>
This commit is contained in:
Philipp Zabel 2023-01-17 17:10:36 +01:00 committed by Daniel Stone
parent 116c234703
commit eb9a740c20
7 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libweston/backend-drm/drm.c
View File

@ -748,7 +748,8 @@ drm_output_apply_mode(struct drm_output *output)
static int
init_pixman(struct drm_backend *b)
{
return pixman_renderer_init(b->compositor);
return weston_compositor_init_renderer(b->compositor,
WESTON_RENDERER_PIXMAN, NULL);
}
/**

4
libweston/backend-headless/headless.c
View File

@ -564,7 +564,9 @@ headless_backend_create(struct weston_compositor *compositor,
weston_log("Error: Pixman renderer does not support decorations.\n");
goto err_input;
}
ret = pixman_renderer_init(compositor);
ret = weston_compositor_init_renderer(compositor,
WESTON_RENDERER_PIXMAN,
NULL);
break;
case WESTON_RENDERER_AUTO:
case WESTON_RENDERER_NOOP:

3
libweston/backend-rdp/rdp.c
View File

@ -1871,7 +1871,8 @@ rdp_backend_create(struct weston_compositor *compositor,
if (weston_compositor_set_presentation_clock_software(compositor) < 0)
goto err_compositor;
if (pixman_renderer_init(compositor) < 0)
if (weston_compositor_init_renderer(compositor, WESTON_RENDERER_PIXMAN,
NULL) < 0)
goto err_compositor;
rdp_head_create(compositor, NULL);

3
libweston/backend-vnc/vnc.c
View File

@ -990,7 +990,8 @@ vnc_backend_create(struct weston_compositor *compositor,
goto err_compositor;
}
if (pixman_renderer_init(compositor) < 0)
if (weston_compositor_init_renderer(compositor, WESTON_RENDERER_PIXMAN,
NULL) < 0)
goto err_compositor;
vnc_head_create(compositor, "vnc");

4
libweston/backend-wayland/wayland.c
View File

@ -2844,7 +2844,9 @@ wayland_backend_create(struct weston_compositor *compositor,
}
if (renderer == WESTON_RENDERER_PIXMAN) {
if (pixman_renderer_init(compositor) < 0) {
if (weston_compositor_init_renderer(compositor,
WESTON_RENDERER_PIXMAN,
NULL) < 0) {
weston_log("Failed to initialize pixman renderer\n");
goto err_display;
}

4
libweston/backend-x11/x11.c
View File

@ -1888,7 +1888,9 @@ x11_backend_create(struct weston_compositor *compositor,
}
if (config->renderer == WESTON_RENDERER_PIXMAN) {
if (pixman_renderer_init(compositor) < 0) {
if (weston_compositor_init_renderer(compositor,
WESTON_RENDERER_PIXMAN,
NULL) < 0) {
weston_log("Failed to initialize pixman renderer for X11 backend\n");
goto err_xdisplay;
}

4
libweston/compositor.c
View File

@ -80,6 +80,7 @@
#include "libweston-internal.h"
#include "color.h"
#include "output-capture.h"
#include "pixman-renderer.h"
#include "renderer-gl/gl-renderer.h"
#include "weston-log-internal.h"
@ -8770,6 +8771,9 @@ weston_compositor_init_renderer(struct weston_compositor *compositor,
compositor->renderer->gl = gl_renderer;
break;
case WESTON_RENDERER_PIXMAN:
ret = pixman_renderer_init(compositor);
break;
default:
ret = -1;
}