Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

compositor: Drop vestigial queueing support #3237

Merged
merged 8 commits into from
Feb 20, 2024

Conversation

RAOF
Copy link
Contributor

@RAOF RAOF commented Feb 19, 2024

We no longer need to be able to set a per-surface SwapInterval; that's handled client side. Likewise, we don't need to support submitting a queue of buffers to a surface; Wayland specifies mailbox¹ semantics.

Drop some of the infrastructure needed to support these features we no longer use anywhere (including QtMir)

¹: ie: framedropping

RAOF added 6 commits February 19, 2024 10:16
Nothing sets this, swap interval is handled client-side with Wayland.
We only use the framedropping codepaths, and `wl_surface`s are specified to
work in mailbox mode (ie: framedropping) mode. We don't need the (unused!)
ability to switch to a queueing mode, nor do we need to be able to flush the
(unused!) queues.
…hod.

This is unused, except for a low-value “destroys its buffers on destruction”
test case (and tests that explicitly test `advance_schedule`, of course)
Since `MultiMonitorArbiter` no longer needs to switch between queueing and
mailbox modes, *and* mailbox is trivial to implement, we can just have
`MultiMonitorArbiter` handle the mailbox directly and drop a layer of indirection.
@RAOF RAOF requested a review from a team as a code owner February 19, 2024 06:39
Copy link

codecov bot commented Feb 19, 2024

Codecov Report

Attention: 2 lines in your changes are missing coverage. Please review.

Comparison is base (117a4df) 77.84% compared to head (71fda59) 77.72%.
Report is 17 commits behind head on main.

Files Patch % Lines
src/server/compositor/multi_monitor_arbiter.cpp 81.81% 2 Missing ⚠️
Additional details and impacted files
@@            Coverage Diff             @@
##             main    #3237      +/-   ##
==========================================
- Coverage   77.84%   77.72%   -0.13%     
==========================================
  Files        1072     1067       -5     
  Lines       75154    67121    -8033     
==========================================
- Hits        58504    52168    -6336     
+ Misses      16650    14953    -1697     

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

Copy link
Collaborator

@AlanGriffiths AlanGriffiths left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks sensible. It seems a shame to lose the flexibility, but we don't need it now.

include/core/mir_toolkit/common.h Outdated Show resolved Hide resolved
src/server/compositor/multi_monitor_arbiter.h Show resolved Hide resolved
There's no need break ABI here.

Co-authored-by: Alan Griffiths <[email protected]>
Copy link
Collaborator

@AlanGriffiths AlanGriffiths left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM now

@AlanGriffiths AlanGriffiths added this pull request to the merge queue Feb 20, 2024
Merged via the queue into main with commit c52c10c Feb 20, 2024
34 of 35 checks passed
@AlanGriffiths AlanGriffiths deleted the various-stream-cleanups branch February 20, 2024 11:07
mattkae pushed a commit that referenced this pull request Mar 27, 2024
compositor: Drop vestigial queueing support
mattkae pushed a commit that referenced this pull request Mar 27, 2024
compositor: Drop vestigial queueing support
@AlanGriffiths AlanGriffiths mentioned this pull request Mar 28, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants