Use the wlroots scene-graph API #197

emersion · 2021-08-09T18:08:48Z

This is a work-in-progress PR to make use of the upcoming wlroots scene-graph API.

Fix multi-output coordinates
Proper allocation error handling
Consider adding a wlr_scene API to replace the various surface_at functions

References: swaywm/wlroots#1966

Hjdskes · 2021-08-09T18:57:46Z

This is very nice! Let me know if you need any help, definitely excited about having this in Cage :)

emersion · 2021-09-22T09:10:16Z

This is now ready for review: all of the wlroots PRs have been merged!

Hjdskes · 2021-09-22T09:14:42Z

This is fantastic! I'll try to review this as soon as possible, but as my wedding is coming up I can't promise anything.

emersion · 2021-09-22T09:45:38Z

my wedding is coming up

Wow, congrats! 💐

No worries at all, in any case I think you'll want to wait for a new wlroots release before merging this?

jbeich · 2021-09-23T20:10:05Z

1301a43 breaks -Dxwayland=true build:

xwayland.c:111:2: warning: implicit declaration of function 'view_damage_part' is invalid in C99 [-Wimplicit-function-declaration]
        view_damage_part(view);
        ^
xwayland.c:120:2: warning: implicit declaration of function 'view_damage_whole' is invalid in C99 [-Wimplicit-function-declaration]
        view_damage_whole(view);
        ^
xwayland.c:143:2: warning: implicit declaration of function 'view_damage_whole' is invalid in C99 [-Wimplicit-function-declaration]
        view_damage_whole(view);
        ^
ld: error: undefined symbol: view_damage_whole
>>> referenced by xwayland.c:143 (xwayland.c:143)
>>>               cage.p/xwayland.c.o:(handle_xwayland_surface_map)
>>> referenced by xwayland.c:120 (xwayland.c:120)
>>>               cage.p/xwayland.c.o:(handle_xwayland_surface_unmap)

ld: error: undefined symbol: view_damage_part
>>> referenced by xwayland.c:111 (xwayland.c:111)
>>>               cage.p/xwayland.c.o:(handle_xwayland_surface_commit)
cc: error: linker command failed with exit code 1 (use -v to see invocation)

emersion · 2021-09-28T10:29:20Z

Thanks, fixed!

dimkr · 2021-10-18T05:58:15Z

@emersion I'm working on a Cage-based compositor, and the scene graph API does solve some issues with Cage - for example, visual artifacts when moving between GTK+ 3 menu items (probably a damage tracking issue of some sort).

However, it crashes (ignore view.c line numbers, it's slightly modified) with wlroots 1b65a80:

==9922== Invalid write of size 8
==9922==    at 0x4869F0B: wl_list_remove (in /usr/lib/x86_64-linux-gnu/libwayland-server.so.0.1.0)
==9922==    by 0x48DA2BE: destroy_xdg_surface (wlr_xdg_surface.c:471)
==9922==    by 0x48D9BF1: xdg_surface_handle_resource_destroy (wlr_xdg_surface.c:282)
==9922==    by 0x4863DBE: ??? (in /usr/lib/x86_64-linux-gnu/libwayland-server.so.0.1.0)
==9922==    by 0x4869EB0: ??? (in /usr/lib/x86_64-linux-gnu/libwayland-server.so.0.1.0)
==9922==    by 0x486A38F: ??? (in /usr/lib/x86_64-linux-gnu/libwayland-server.so.0.1.0)
==9922==    by 0x4864848: wl_client_destroy (in /usr/lib/x86_64-linux-gnu/libwayland-server.so.0.1.0)
==9922==    by 0x48650B5: wl_display_flush_clients (in /usr/lib/x86_64-linux-gnu/libwayland-server.so.0.1.0)
==9922==    by 0x48650F7: wl_display_run (in /usr/lib/x86_64-linux-gnu/libwayland-server.so.0.1.0)
==9922==    by 0x10DDB0: main (cage.c:497)
==9922==  Address 0xd00d028 is 120 bytes inside a block of size 144 free'd
==9922==    at 0x48399AB: free (in /usr/lib/x86_64-linux-gnu/valgrind/vgpreload_memcheck-amd64-linux.so)
==9922==    by 0x48CAEA6: wlr_scene_node_destroy (wlr_scene.c:105)
==9922==    by 0x48CAD3D: scene_node_finish (wlr_scene.c:71)
==9922==    by 0x48CADAC: wlr_scene_node_destroy (wlr_scene.c:85)
==9922==    by 0x1118FD: view_unmap (view.c:198)
==9922==    by 0x11249C: handle_xdg_shell_surface_unmap (xdg_shell.c:250)
==9922==    by 0x490CC00: wlr_signal_emit_safe (signal.c:29)
==9922==    by 0x48D9384: unmap_xdg_surface (wlr_xdg_surface.c:40)
==9922==    by 0x48DA114: reset_xdg_surface (wlr_xdg_surface.c:426)
==9922==    by 0x48DA262: destroy_xdg_surface (wlr_xdg_surface.c:464)
==9922==    by 0x48D9BF1: xdg_surface_handle_resource_destroy (wlr_xdg_surface.c:282)
==9922==    by 0x4863DBE: ??? (in /usr/lib/x86_64-linux-gnu/libwayland-server.so.0.1.0)

I'm still investigating this, but maybe you'll see something I don't.

emersion · 2021-10-18T12:34:46Z

Does this help? swaywm/wlroots#3268

dimkr · 2021-10-18T14:08:21Z

Does this help? swaywm/wlroots#3268

So far - nope! Doesn't reproduce.

emersion · 2021-10-18T14:20:27Z

Do you mean that this patch fixes the issue? Or do you mean that it doesn't?

dimkr · 2021-10-18T14:24:36Z

So far I don't see this - tried -fsanitize=address too, and looks like this particular problem doesn't reproduce with the patch. However, I'm not 100% sure how I triggered this condition.

emersion · 2021-10-27T14:24:05Z

Dropped a few more things in favor of scene-graph helpers: direct scan-out, per-output surface iterators, and xdg_popup handling.

Hjdskes · 2021-10-27T15:30:54Z

This is looking so good!

dimkr · 2021-11-07T19:26:19Z

@Hjdskes Will this PR be part of the 0.15.0 release of Cage?

Hjdskes · 2021-11-07T21:07:03Z

Yes! It is my intention to include this in the next release of Cage that will track wlroots 0.15.0 :)

jbeich · 2021-11-19T02:34:32Z

cb7d6a5 is no longer enough after wlroots@fdf3169:

cage.c:308:13: warning: implicit declaration of function 'wlr_backend_get_renderer' is invalid in C99 [-Wimplicit-function-declaration]
        renderer = wlr_backend_get_renderer(server.backend);
                   ^
cage.c:308:11: warning: incompatible integer to pointer conversion assigning to 'struct wlr_renderer *' from 'int' [-Wint-conversion]
        renderer = wlr_backend_get_renderer(server.backend);
                 ^ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
2 warnings generated.
ld: error: undefined symbol: wlr_backend_get_renderer
>>> referenced by cage.c:308 (cage.c:308)
>>>               cage.p/cage.c.o:(main)
cc: error: linker command failed with exit code 1 (use -v to see invocation)

emersion · 2021-12-19T15:55:06Z

@Hjdskes I cannot reproduce. Can you share full debug logs?

@iamdavidcz I've opened this wlroots MR to avoid the confusion: https://gitlab.freedesktop.org/wlroots/wlroots/-/merge_requests/3407

- Update wlr_box includes to util/box.h: the wlroots header has been moved upstream. - Subsurface fields have been moved - Create renderer and allocator, stop using wlr_backend_get_renderer - Initalize output rendering

iamdavidcz · 2021-12-19T16:01:47Z

@emersion that's gonna work. What was the rationale behind making libinput optional in wlroots 0.15.0?

emersion · 2021-12-19T16:03:33Z

What was the rationale behind making libinput optional in wlroots 0.15.0?

Some compositors are not designed to be run with DRM+libinput, like virtual reality compositors or nested compositors.

seat.c

view.c

Hjdskes · 2021-12-19T16:23:20Z

Indeed forcing the libinput backend makes the cursor work & input focus work :) Here's the debug log you requested @emersion: https://gist.github.com/Hjdskes/a1ca59f3637af865dc04e9b091d693f7. This is just a quick Cage session from TTY (./build/cage epiphany).

References: swaywm/wlroots#1966

With the scene-graph, these are no longer used.

Delegate sub-surface handling to wlr_scene_surface_tree_create. References: swaywm/wlroots#3128

References: swaywm/wlroots#3117

This provides wlr_output_layout integration. References: swaywm/wlroots#3160

It's used only by send_frame_done. Instead of keeping a generic iterator, let's inline it in the only user.

Depends on [1]. [1]: swaywm/wlroots#3279

See swaywm/wlroots#3298

This is now unused.

We get this for free with wlr_scene.

iamdavidcz · 2021-12-21T11:17:00Z

@Hjdskes any chance that this will be merged before Christmas? Can I help with testing somehow?

Hjdskes

Thanks for this @emersion!

emersion mentioned this pull request Aug 9, 2021

Introduce new scene-graph API swaywm/wlroots#1966

Merged

emersion force-pushed the scenegraph branch from 66a975f to baba31b Compare August 9, 2021 18:57

emersion force-pushed the scenegraph branch 2 times, most recently from 23ed781 to 629833e Compare August 11, 2021 09:29

emersion force-pushed the scenegraph branch from c01df61 to 1ef4cf5 Compare August 17, 2021 14:54

emersion mentioned this pull request Aug 17, 2021

Use scene-graph for damage tracking #203

Closed

emersion force-pushed the scenegraph branch 2 times, most recently from 2736e1e to 7749855 Compare September 9, 2021 08:56

emersion force-pushed the scenegraph branch from ed6c98c to 0d24e6f Compare September 22, 2021 09:09

emersion marked this pull request as ready for review September 22, 2021 09:45

emersion force-pushed the scenegraph branch from dee886e to f1ba664 Compare September 28, 2021 10:29

bl4ckb0ne mentioned this pull request Oct 18, 2021

scene: remove surface commit listener when node is destroyed swaywm/wlroots#3268

Merged

emersion force-pushed the scenegraph branch from 3fefba4 to 451c631 Compare October 20, 2021 14:12

jbeich mentioned this pull request Nov 11, 2021

Fix build error with 0.15.0 wlroots #217

Closed

Upgrade to wlroots 0.15

6772f13

- Update wlr_box includes to util/box.h: the wlroots header has been moved upstream. - Subsurface fields have been moved - Create renderer and allocator, stop using wlr_backend_get_renderer - Initalize output rendering

emersion force-pushed the scenegraph branch from 8c17008 to 97e7e30 Compare December 19, 2021 16:01

Hjdskes reviewed Dec 19, 2021

View reviewed changes

seat.c Show resolved Hide resolved

view.c Show resolved Hide resolved

Hjdskes mentioned this pull request Dec 19, 2021

Build error with wlroot-git (0.15.0) #216

Closed

emersion and others added 16 commits December 20, 2021 11:00

Use the wlroots scene-graph API

35daf06

References: swaywm/wlroots#1966

Drop view_for_each_surface and view_for_each_popup_surface

b8f1892

With the scene-graph, these are no longer used.

Replace view_wlr_surface_at with scene-graph

d51d9cc

Use scene-graph helpers for sub-surfaces

92c1b78

Delegate sub-surface handling to wlr_scene_surface_tree_create. References: swaywm/wlroots#3128

Use scene-graph for damage tracking

6a99224

References: swaywm/wlroots#3117

Use wlr_scene_attach_output_layout

f12189a

This provides wlr_output_layout integration. References: swaywm/wlroots#3160

Drop unused output_surface_for_each_surface

adb337d

Remove output_for_each_surface

efdacc6

It's used only by send_frame_done. Instead of keeping a generic iterator, let's inline it in the only user.

Delegate direct scan-out to wlr_scene

0619657

Depends on [1]. [1]: swaywm/wlroots#3279

Use wlr_scene_output_for_each_surface

ac03713

Use wlr_scene_xdg_surface_create for popups

2587a85

See swaywm/wlroots#3298

Drop cg_view_child

cc40126

This is now unused.

Use wlr_scene_output_send_frame_done

746bd49

Enable viewporter

fade96a

We get this for free with wlr_scene.

Enable presentation-time

e945a62

We get this for free with wlr_scene.

Remove no longer needed dependencies

13e3c63

emersion force-pushed the scenegraph branch from 97e7e30 to 13e3c63 Compare December 20, 2021 10:01

primeos mentioned this pull request Dec 20, 2021

Remove wlroots_0_14 (tracking issue) NixOS/nixpkgs#151311

Closed

17 tasks

Hjdskes approved these changes Dec 21, 2021

View reviewed changes

Hjdskes merged commit dfba2d8 into cage-kiosk:master Dec 21, 2021

Hjdskes mentioned this pull request Dec 22, 2021

scene graph: Failed to get DMA-BUF from buffer #225

Closed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Use the wlroots scene-graph API #197

Use the wlroots scene-graph API #197

emersion commented Aug 9, 2021 •

edited

Hjdskes commented Aug 9, 2021

emersion commented Sep 22, 2021

Hjdskes commented Sep 22, 2021

emersion commented Sep 22, 2021

jbeich commented Sep 23, 2021

emersion commented Sep 28, 2021

dimkr commented Oct 18, 2021

emersion commented Oct 18, 2021

dimkr commented Oct 18, 2021 •

edited

emersion commented Oct 18, 2021

dimkr commented Oct 18, 2021

emersion commented Oct 27, 2021

Hjdskes commented Oct 27, 2021

dimkr commented Nov 7, 2021

Hjdskes commented Nov 7, 2021

jbeich commented Nov 19, 2021 •

edited

emersion commented Dec 19, 2021

iamdavidcz commented Dec 19, 2021

emersion commented Dec 19, 2021

Hjdskes commented Dec 19, 2021

iamdavidcz commented Dec 21, 2021

Hjdskes left a comment

Use the wlroots scene-graph API #197

Use the wlroots scene-graph API #197

Conversation

emersion commented Aug 9, 2021 • edited

Hjdskes commented Aug 9, 2021

emersion commented Sep 22, 2021

Hjdskes commented Sep 22, 2021

emersion commented Sep 22, 2021

jbeich commented Sep 23, 2021

emersion commented Sep 28, 2021

dimkr commented Oct 18, 2021

emersion commented Oct 18, 2021

dimkr commented Oct 18, 2021 • edited

emersion commented Oct 18, 2021

dimkr commented Oct 18, 2021

emersion commented Oct 27, 2021

Hjdskes commented Oct 27, 2021

dimkr commented Nov 7, 2021

Hjdskes commented Nov 7, 2021

jbeich commented Nov 19, 2021 • edited

emersion commented Dec 19, 2021

iamdavidcz commented Dec 19, 2021

emersion commented Dec 19, 2021

Hjdskes commented Dec 19, 2021

iamdavidcz commented Dec 21, 2021

Hjdskes left a comment

Choose a reason for hiding this comment

emersion commented Aug 9, 2021 •

edited

dimkr commented Oct 18, 2021 •

edited

jbeich commented Nov 19, 2021 •

edited