Revert "use wlr_scene_output_build_state() to set gamma"
This reverts commit 65f68e7643
.
This commit is contained in:
parent
1e1811f953
commit
6095ff84d2
1 changed files with 4 additions and 15 deletions
19
dwl.c
19
dwl.c
|
@ -2061,26 +2061,15 @@ void
|
|||
setgamma(struct wl_listener *listener, void *data)
|
||||
{
|
||||
struct wlr_gamma_control_manager_v1_set_gamma_event *event = data;
|
||||
Monitor *m = event->output->data;
|
||||
struct wlr_output_state pending = {0};
|
||||
if (!m)
|
||||
if (!wlr_gamma_control_v1_apply(event->control, &event->output->pending))
|
||||
return;
|
||||
|
||||
if (!wlr_scene_output_build_state(m->scene_output, &pending))
|
||||
return;
|
||||
|
||||
if (!wlr_gamma_control_v1_apply(event->control, &pending))
|
||||
goto out;
|
||||
|
||||
if (!wlr_output_commit_state(m->wlr_output, &pending)) {
|
||||
if (!wlr_output_test(event->output)) {
|
||||
wlr_output_rollback(event->output);
|
||||
wlr_gamma_control_v1_send_failed_and_destroy(event->control);
|
||||
goto out;
|
||||
}
|
||||
|
||||
wlr_damage_ring_rotate(&m->scene_output->damage_ring);
|
||||
|
||||
out:
|
||||
wlr_output_state_finish(&pending);
|
||||
wlr_output_schedule_frame(event->output);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
Loading…
Reference in a new issue