diff options
| author | Isaac Freund <mail@isaacfreund.com> | 2023-03-01 11:33:26 +0100 |
|---|---|---|
| committer | Isaac Freund <mail@isaacfreund.com> | 2023-03-01 11:33:26 +0100 |
| commit | 5f0af38992992593fca71783f13896cf6a223718 (patch) | |
| tree | 6c7fd55c7e99383fbc4081a4377a9cb8196e23c6 | |
| parent | 472f882f42d60ebc35fdb6998543c2305dbfc096 (diff) | |
| download | river-5f0af38992992593fca71783f13896cf6a223718.tar.gz river-5f0af38992992593fca71783f13896cf6a223718.tar.xz | |
session-lock: fix race with multiple outputs
The race is as follows:
1. Output A commits and sets render state to pending_lock_surface
2. Output B commits and sets render state to pending_lock_surface
3. Output A presents and sets render state to lock_surface
4. maybeLock() does not lock because waiting on output B
5. Output A commits and sets render state to pending_lock_surface
6. Output B presents and sets render state to lock_surface
4. maybeLock() does not lock because waiting on output A
| -rw-r--r-- | river/Output.zig | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/river/Output.zig b/river/Output.zig index b92a4e2..e300598 100644 --- a/river/Output.zig +++ b/river/Output.zig @@ -428,8 +428,16 @@ fn handleFrame(listener: *wl.Listener(*wlr.Output), _: *wlr.Output) void { .unlocked, .pending_blank, .pending_lock_surface => unreachable, .blanked, .lock_surface => {}, }, - .waiting_for_blank => output.lock_render_state = .pending_blank, - .waiting_for_lock_surfaces => output.lock_render_state = .pending_lock_surface, + .waiting_for_blank => { + if (output.lock_render_state != .blanked) { + output.lock_render_state = .pending_blank; + } + }, + .waiting_for_lock_surfaces => { + if (output.lock_render_state != .lock_surface) { + output.lock_render_state = .pending_lock_surface; + } + }, } } } else { |