From 0c2cf618959f787c4c204053e2c5d24f9dc49633 Mon Sep 17 00:00:00 2001
From: Consolatis <35009135+Consolatis@users.noreply.github.com>
Date: Wed, 27 Nov 2024 04:48:45 +0100
Subject: [PATCH] chase wlroots: use WLR_PRIVATE (MR 4842)

Ref: 6006023a377868187f73d2e0922bbe952072684f
("Use WLR_PRIVATE for private fields")
---
 src/common/scene-helpers.c | 10 ++++++----
 src/magnifier.c            |  2 +-
 src/server.c               |  2 +-
 src/view.c                 |  4 ++--
 subprojects/wlroots.wrap   |  2 +-
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/common/scene-helpers.c b/src/common/scene-helpers.c
index e4a5e4c4..c05a5226 100644
--- a/src/common/scene-helpers.c
+++ b/src/common/scene-helpers.c
@@ -58,8 +58,8 @@ scene_output_damage(struct wlr_scene_output *scene_output,
 
 	if (pixman_region32_not_empty(&clipped)) {
 		wlr_damage_ring_add(&scene_output->damage_ring, &clipped);
-		pixman_region32_union(&scene_output->pending_commit_damage,
-			&scene_output->pending_commit_damage, &clipped);
+		pixman_region32_union(&scene_output->WLR_PRIVATE.pending_commit_damage,
+			&scene_output->WLR_PRIVATE.pending_commit_damage, &clipped);
 	}
 
 	pixman_region32_fini(&clipped);
@@ -85,8 +85,10 @@ lab_wlr_scene_output_commit(struct wlr_scene_output *scene_output,
 	 * rendering on every output commit and overloads CPU.
 	 * We also need to verify the necessity of wants_magnification.
 	 */
-	if (!wlr_output->needs_frame && !pixman_region32_not_empty(
-			&scene_output->pending_commit_damage) && !wants_magnification) {
+	if (!wlr_output->needs_frame
+			&& !pixman_region32_not_empty(
+				&scene_output->WLR_PRIVATE.pending_commit_damage)
+			&& !wants_magnification) {
 		return true;
 	}
 
diff --git a/src/magnifier.c b/src/magnifier.c
index e1b3fcd9..0846e02a 100644
--- a/src/magnifier.c
+++ b/src/magnifier.c
@@ -237,7 +237,7 @@ static void
 enable_magnifier(struct server *server, bool enable)
 {
 	magnify_on = enable;
-	server->scene->direct_scanout = enable ? false
+	server->scene->WLR_PRIVATE.direct_scanout = enable ? false
 		: server->direct_scanout_enabled;
 }
 
diff --git a/src/server.c b/src/server.c
index 9e87655e..3c5938c0 100644
--- a/src/server.c
+++ b/src/server.c
@@ -549,7 +549,7 @@ server_init(struct server *server)
 		wlr_log(WLR_ERROR, "unable to create scene");
 		exit(EXIT_FAILURE);
 	}
-	server->direct_scanout_enabled = server->scene->direct_scanout;
+	server->direct_scanout_enabled = server->scene->WLR_PRIVATE.direct_scanout;
 
 	/*
 	 * The order in which the scene-trees below are created determines the
diff --git a/src/view.c b/src/view.c
index cf97b860..2b01cce8 100644
--- a/src/view.c
+++ b/src/view.c
@@ -552,7 +552,7 @@ view_update_outputs(struct view *view)
 	wl_list_for_each(output, &view->server->outputs, link) {
 		if (output_is_usable(output) && wlr_output_layout_intersects(
 				layout, output->wlr_output, &view->current)) {
-			new_outputs |= (1ull << output->scene_output->index);
+			new_outputs |= (1ull << output->scene_output->WLR_PRIVATE.index);
 		}
 	}
 
@@ -569,7 +569,7 @@ view_on_output(struct view *view, struct output *output)
 	assert(view);
 	assert(output);
 	return output->scene_output
-			&& (view->outputs & (1ull << output->scene_output->index));
+			&& (view->outputs & (1ull << output->scene_output->WLR_PRIVATE.index));
 }
 
 void
diff --git a/subprojects/wlroots.wrap b/subprojects/wlroots.wrap
index b51516a2..5bd994b6 100644
--- a/subprojects/wlroots.wrap
+++ b/subprojects/wlroots.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://gitlab.freedesktop.org/wlroots/wlroots.git
-revision = 009515161bd97d8f920d72d31ef462f2608688e8
+revision = 6006023a377868187f73d2e0922bbe952072684f
 
 [provide]
 dependency_names = wlroots-0.19