aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLibravatar Simon Ser <contact@emersion.fr>2020-12-09 21:59:23 +0100
committerLibravatar Tudor Brindus <me@tbrindus.ca>2020-12-20 00:51:46 -0500
commit33b64667ae0bfe9af752cb8c850b4f52b34660d2 (patch)
tree665ef8858dd8c084c002905831127c80a3aac075
parentreadme: use references for links (diff)
downloadsway-33b64667ae0bfe9af752cb8c850b4f52b34660d2.tar.gz
sway-33b64667ae0bfe9af752cb8c850b4f52b34660d2.tar.zst
sway-33b64667ae0bfe9af752cb8c850b4f52b34660d2.zip
Test output before direct scan-out
This avoids some log spam. Eventually when we wire up the atomic test commit this will take care of the other log spam referenced below. References: https://github.com/swaywm/sway/pull/5010 References: https://github.com/swaywm/wlroots/issues/2181 Closes: https://github.com/swaywm/wlroots/issues/2532
-rw-r--r--sway/desktop/output.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/sway/desktop/output.c b/sway/desktop/output.c
index c21cdb00..06acb868 100644
--- a/sway/desktop/output.c
+++ b/sway/desktop/output.c
@@ -548,10 +548,14 @@ static bool scan_out_fullscreen_view(struct sway_output *output,
548 return false; 548 return false;
549 } 549 }
550 550
551 wlr_output_attach_buffer(wlr_output, &surface->buffer->base);
552 if (!wlr_output_test(wlr_output)) {
553 return false;
554 }
555
551 wlr_presentation_surface_sampled_on_output(server.presentation, surface, 556 wlr_presentation_surface_sampled_on_output(server.presentation, surface,
552 wlr_output); 557 wlr_output);
553 558
554 wlr_output_attach_buffer(wlr_output, &surface->buffer->base);
555 return wlr_output_commit(wlr_output); 559 return wlr_output_commit(wlr_output);
556} 560}
557 561