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

Output: fix Wayland backend support

Browse Source 
The wlroots Wayland backend does not support gamma LUT application and
will currently fail to render anything if river commits a gamma LUT.

To fix this, test the state when applying a gamma LUT and fall back to a
state with no gamma LUT set if that fails.

This problem was revealed by 2e09b66 which flags gamma as dirty on all
outputs when they are enabled.

(cherry picked from commit a80e0f7322)
This commit is contained in:
Isaac Freund
2024-07-01 12:27:16 +02:00
parent 5cfa1fc8f5
commit 6e0c103705
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
build.zig.zon
View File

@ -12,8 +12,8 @@
.hash = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242", .hash = "1220687c8c47a48ba285d26a05600f8700d37fc637e223ced3aa8324f3650bf52242",
}, },
.@"zig-wlroots" = .{ .@"zig-wlroots" = .{
.url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.17.1.tar.gz", .url = "https://codeberg.org/ifreund/zig-wlroots/archive/v0.17.2.tar.gz",
.hash = "1220c65ab884c236cc950b564c70f6cd04046d86485ee76e0cde886cef7438021b4f", .hash = "1220bb5e5c802c517425bc1d8d8d43d7b7fe5eb81ce4c46b15ce829d67ddadc55418",
}, },
.@"zig-xkbcommon" = .{ .@"zig-xkbcommon" = .{
.url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz", .url = "https://codeberg.org/ifreund/zig-xkbcommon/archive/v0.2.0.tar.gz",

15
river/Output.zig
View File

@ -540,18 +540,23 @@ fn renderAndCommit(output: *Output, scene_output: *wlr.SceneOutput) !void {
var state = wlr.Output.State.init(); var state = wlr.Output.State.init();
defer state.finish(); defer state.finish();
if (server.root.gamma_control_manager.getControl(output.wlr_output)) |control| { const control = server.root.gamma_control_manager.getControl(output.wlr_output);
log.info("applying gamma settings from client", .{}); if (!wlr.GammaControlV1.apply(control, &state)) return error.OutOfMemory;
if (!control.apply(&state)) return error.OutOfMemory;
} else { if (!output.wlr_output.testState(&state)) {
log.info("clearing gamma settings from client", .{}); wlr.GammaControlV1.sendFailedAndDestroy(control);
state.clearGammaLut(); state.clearGammaLut();
// If the backend does not support gamma LUTs it will reject any
// state with the gamma LUT committed bit set even if the state
// has a null LUT. The wayland backend for example has this behavior.
state.committed.gamma_lut = false;
} }
if (!scene_output.buildState(&state, null)) return error.CommitFailed; if (!scene_output.buildState(&state, null)) return error.CommitFailed;
if (!output.wlr_output.commitState(&state)) return error.CommitFailed; if (!output.wlr_output.commitState(&state)) return error.CommitFailed;
// TODO(wlroots) remove this rotate() call when updating to wlroots 0.18
scene_output.damage_ring.rotate(); scene_output.damage_ring.rotate();
output.gamma_dirty = false; output.gamma_dirty = false;
} else { } else {