From 092115786e5b735a62c5aff95b4c8e815cf4defd Mon Sep 17 00:00:00 2001
From: Pekka Paalanen <pekka.paalanen@collabora.com>
Date: Tue, 17 May 2022 15:15:47 +0300
Subject: [PATCH] gl-renderer: move extension lists away from log

Print all EGL and OpenGL extension lists into a new log scope
"gl-renderer" instead of the usual log.

These lists cluttered the log while they were very rarely actually
useful. Sometimes they might be interesting, so make them still
available through the new log scope.

Signed-off-by: Pekka Paalanen <pekka.paalanen@collabora.com>
---
 libweston/renderer-gl/gl-renderer-internal.h |  1 +
 libweston/renderer-gl/gl-renderer.c          | 26 ++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/libweston/renderer-gl/gl-renderer-internal.h b/libweston/renderer-gl/gl-renderer-internal.h
index db541921..d84d9d37 100644
--- a/libweston/renderer-gl/gl-renderer-internal.h
+++ b/libweston/renderer-gl/gl-renderer-internal.h
@@ -115,6 +115,7 @@ struct gl_shader_config {
 struct gl_renderer {
 	struct weston_renderer base;
 	struct weston_compositor *compositor;
+	struct weston_log_scope *renderer_scope;
 
 	bool fragment_shader_debug;
 	bool fan_debug;
diff --git a/libweston/renderer-gl/gl-renderer.c b/libweston/renderer-gl/gl-renderer.c
index fd7b28fb..843da8f1 100644
--- a/libweston/renderer-gl/gl-renderer.c
+++ b/libweston/renderer-gl/gl-renderer.c
@@ -3248,20 +3248,25 @@ gl_renderer_log_extensions(struct gl_renderer *gr,
 	int l;
 	int len;
 
-	l = weston_log("%s:", name);
+	if (!weston_log_scope_is_enabled(gr->renderer_scope))
+		return;
+
+	l = weston_log_scope_printf(gr->renderer_scope, "%s:", name);
 	p = extensions;
 	while (*p) {
 		end = strchrnul(p, ' ');
 		len = end - p;
-		if (l + len > 78)
-			l = weston_log_continue("\n" STAMP_SPACE "%.*s",
-						len, p);
-		else
-			l += weston_log_continue(" %.*s", len, p);
+		if (l + len > 78) {
+			l = weston_log_scope_printf(gr->renderer_scope,
+						    "\n  %.*s", len, p);
+		} else {
+			l += weston_log_scope_printf(gr->renderer_scope,
+						     " %.*s", len, p);
+		}
 		for (p = end; isspace(*p); p++)
 			;
 	}
-	weston_log_continue("\n");
+	weston_log_scope_printf(gr->renderer_scope, "\n");
 }
 
 static void
@@ -3585,6 +3590,7 @@ gl_renderer_destroy(struct weston_compositor *ec)
 		weston_binding_destroy(gr->fan_binding);
 
 	weston_log_scope_destroy(gr->shader_scope);
+	weston_log_scope_destroy(gr->renderer_scope);
 	free(gr);
 }
 
@@ -3667,6 +3673,11 @@ gl_renderer_display_create(struct weston_compositor *ec,
 	wl_list_init(&gr->shader_list);
 	gr->platform = options->egl_platform;
 
+	gr->renderer_scope = weston_compositor_add_log_scope(ec, "gl-renderer",
+		"GL-renderer verbose messages\n", NULL, NULL, gr);
+	if (!gr->renderer_scope)
+		goto fail;
+
 	gr->shader_scope = gl_shader_scope_create(gr);
 	if (!gr->shader_scope)
 		goto fail;
@@ -3798,6 +3809,7 @@ fail_terminate:
 	eglTerminate(gr->egl_display);
 fail:
 	weston_log_scope_destroy(gr->shader_scope);
+	weston_log_scope_destroy(gr->renderer_scope);
 	free(gr);
 	ec->renderer = NULL;
 	return -1;