From f154fbba97ddf428f89ac9786f805490a842a74c Mon Sep 17 00:00:00 2001
From: Philipp Zabel
Date: Thu, 4 May 2023 11:40:22 +0200
Subject: libweston: consolidate 'Using GL/Pixman renderer' log message
Consolidates the 'Using GL/Pixman renderer' message emitted by the
PipeWire, RDP, VNC, and X11 backends by moving the weston_log() into
weston_compositor_init_renderer(). Only print the message after
initializing the renderer has succeeded.
This effectively adds the message to the DRM, headless, and Wayland
backends.
Signed-off-by: Philipp Zabel
---
libweston/backend-pipewire/pipewire.c | 1 -
libweston/backend-rdp/rdp.c | 1 -
libweston/backend-vnc/vnc.c | 1 -
libweston/backend-x11/x11.c | 2 --
libweston/compositor.c | 4 ++++
5 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/libweston/backend-pipewire/pipewire.c b/libweston/backend-pipewire/pipewire.c
index 0329e914..5fce219c 100644
--- a/libweston/backend-pipewire/pipewire.c
+++ b/libweston/backend-pipewire/pipewire.c
@@ -923,7 +923,6 @@ pipewire_backend_create(struct weston_compositor *compositor,
switch (config->renderer) {
case WESTON_RENDERER_AUTO:
case WESTON_RENDERER_PIXMAN:
- weston_log("Using Pixman renderer\n");
break;
default:
weston_log("Unsupported renderer requested\n");
diff --git a/libweston/backend-rdp/rdp.c b/libweston/backend-rdp/rdp.c
index 915b7c02..6bdc9abc 100644
--- a/libweston/backend-rdp/rdp.c
+++ b/libweston/backend-rdp/rdp.c
@@ -1851,7 +1851,6 @@ rdp_backend_create(struct weston_compositor *compositor,
switch (config->renderer) {
case WESTON_RENDERER_PIXMAN:
case WESTON_RENDERER_AUTO:
- weston_log("Using Pixman renderer\n");
break;
default:
weston_log("Unsupported renderer requested\n");
diff --git a/libweston/backend-vnc/vnc.c b/libweston/backend-vnc/vnc.c
index 2d8042d6..5723a558 100644
--- a/libweston/backend-vnc/vnc.c
+++ b/libweston/backend-vnc/vnc.c
@@ -1089,7 +1089,6 @@ vnc_backend_create(struct weston_compositor *compositor,
switch (config->renderer) {
case WESTON_RENDERER_AUTO:
case WESTON_RENDERER_PIXMAN:
- weston_log("Using Pixman renderer\n");
break;
default:
weston_log("Unsupported renderer requested\n");
diff --git a/libweston/backend-x11/x11.c b/libweston/backend-x11/x11.c
index f115acda..43fff36e 100644
--- a/libweston/backend-x11/x11.c
+++ b/libweston/backend-x11/x11.c
@@ -1922,8 +1922,6 @@ x11_backend_create(struct weston_compositor *compositor,
&options.base) < 0)
goto err_xdisplay;
}
- weston_log("Using %s renderer\n",
- (config->renderer == WESTON_RENDERER_PIXMAN) ? "pixman" : "gl");
b->base.destroy = x11_destroy;
b->base.create_output = x11_output_create;
diff --git a/libweston/compositor.c b/libweston/compositor.c
index 838b5685..379cf391 100644
--- a/libweston/compositor.c
+++ b/libweston/compositor.c
@@ -9113,9 +9113,13 @@ weston_compositor_init_renderer(struct weston_compositor *compositor,
return ret;
compositor->renderer->gl = gl_renderer;
+ weston_log("Using GL renderer\n");
break;
case WESTON_RENDERER_PIXMAN:
ret = pixman_renderer_init(compositor);
+ if (ret < 0)
+ return ret;
+ weston_log("Using Pixman renderer\n");
break;
default:
ret = -1;
--
cgit v1.2.1