mirrors/sway
1
0
Fork 0
mirror of https://github.com/swaywm/sway.git synced 2024-11-22 07:51:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Set color transform when calling wlr_scene_output_build_state()

Browse source 
We were only passing the color transform when calling
wlr_scene_output_commit(). However when modesetting or pushing a
new gamma LUT we render via wlr_scene_output_build_state(). Pass
the color transform there as well.
This commit is contained in:
Simon Ser 2024-06-08 11:28:42 +02:00 committed by Kenny Levinsen
parent 40ca4150b2
commit cc34210769
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
sway/config/output.c
View file

@ -927,6 +927,7 @@ bool apply_output_configs(struct matched_output_config *configs,
struct wlr_scene_output_state_options opts = { struct wlr_scene_output_state_options opts = {
.swapchain = wlr_output_swapchain_manager_get_swapchain( .swapchain = wlr_output_swapchain_manager_get_swapchain(
&swapchain_mgr, backend_state->output), &swapchain_mgr, backend_state->output),
.color_transform = cfg->output->color_transform,
}; };
struct wlr_scene_output *scene_output = cfg->output->scene_output; struct wlr_scene_output *scene_output = cfg->output->scene_output;
struct wlr_output_state *state = &backend_state->base; struct wlr_output_state *state = &backend_state->base;

9
sway/desktop/output.c
View file

@ -243,10 +243,14 @@ static int output_repaint_timer_handler(void *data) {
output_configure_scene(output, &root->root_scene->tree.node, 1.0f); output_configure_scene(output, &root->root_scene->tree.node, 1.0f);
struct wlr_scene_output_state_options opts = {
.color_transform = output->color_transform,
};
if (output->gamma_lut_changed) { if (output->gamma_lut_changed) {
struct wlr_output_state pending; struct wlr_output_state pending;
wlr_output_state_init(&pending); wlr_output_state_init(&pending);
if (!wlr_scene_output_build_state(output->scene_output, &pending, NULL)) { if (!wlr_scene_output_build_state(output->scene_output, &pending, &opts)) {
return 0; return 0;
} }
@ -269,9 +273,6 @@ static int output_repaint_timer_handler(void *data) {
return 0; return 0;
} }
struct wlr_scene_output_state_options opts = {
.color_transform = output->color_transform,
};
wlr_scene_output_commit(output->scene_output, &opts); wlr_scene_output_commit(output->scene_output, &opts);
return 0; return 0;
} }