Zander671/river
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

View: fix SSD desync on consecutive timeouts

Browse Source 
If multiple consecutive transaction timeouts occur it is possible for
the SSD borders to become temporarily desynchronized with the size of
the rendered surface.

This is especially noticeable during interactive resize of mpv.

For details on cause/fix, see the new comment in the code.
This commit is contained in:
Isaac Freund 2024-03-13 15:57:01 +01:00
parent b0dc5f7294
commit fecfa89a9a
No known key found for this signature in database
GPG Key ID: 86DED400DDFD7A11
1 changed files with 25 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
river/View.zig
View File

@ -296,13 +296,32 @@ pub fn commitTransaction(view: *Self) void {
.acked => xdg_toplevel.configure_state = .timed_out_acked,
else => unreachable,
}
// The width and height cannot be updated until the client has
// committed a new buffer in response to the configure.
const old_width = view.current.box.width;
const old_height = view.current.box.height;
// The transaction has timed out for the xdg toplevel, which means a commit
// in response to the configure with the inflight width/height has not yet
// been made. It may seem that we should therefore leave the current.box
// width/height unchanged. However, this would in fact cause visual glitches.
//
// We must update the dimensions to the current geometry of the
// xdg toplevel here in order to handle the following series of events:
//
// 0. initial state: client has dimensions X
// 1. transaction A sends a configure of size Y
// 2. transaction A times out - saved surfaces are dropped
// 3. transaction B sends a configure of size Z
// 4. client commits buffer of size Y
// 5. transaction B times out - saved surfaces are dropped
//
// If we did not use the current geometry of the toplevel at this point
// we would be rendering the SSD border at initial size X but the surface
// would be rendered at size Y.
if (view.inflight.resizing) {
view.resizeUpdatePosition(xdg_toplevel.geometry.width, xdg_toplevel.geometry.height);
}
view.current = view.inflight;
view.current.box.width = old_width;
view.current.box.height = old_height;
view.current.box.width = xdg_toplevel.geometry.width;
view.current.box.height = xdg_toplevel.geometry.height;
},
.idle, .committed => {
xdg_toplevel.configure_state = .idle;