mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-23 06:59:44 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

output: drop wlr_output_state.buffer_type

Browse source 
This is now unconditionally set to WLR_OUTPUT_STATE_BUFFER_SCANOUT.
This commit is contained in:
Simon Ser 2021-07-12 18:01:40 +02:00 • committed by Simon Zeni
parent f211bc983a
commit 3132c0ab10
6 changed files with 3 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
types/wlr_output.c
View file

@ -721,8 +721,7 @@ static bool output_basic_test(struct wlr_output *output) {
return false;
}
if (output->pending.buffer_type == WLR_OUTPUT_STATE_BUFFER_SCANOUT &&
output->back_buffer == NULL) {
if (output->back_buffer == NULL) {
if (output->attach_render_locks > 0) {
wlr_log(WLR_DEBUG, "Direct scan-out disabled by lock");
return false;
@ -911,7 +910,6 @@ void wlr_output_attach_buffer(struct wlr_output *output,
struct wlr_buffer *buffer) {
output_state_clear_buffer(&output->pending);
output->pending.committed |= WLR_OUTPUT_STATE_BUFFER;
output->pending.buffer_type = WLR_OUTPUT_STATE_BUFFER_SCANOUT;
output->pending.buffer = wlr_buffer_lock(buffer);
}

3
types/wlr_output_damage.c
View file

@ -52,8 +52,7 @@ static void output_handle_precommit(struct wl_listener *listener, void *data) {
if (output->pending.committed & WLR_OUTPUT_STATE_BUFFER) {
// TODO: find a better way to access this info without a precommit
// handler
output_damage->pending_attach_render = output->back_buffer != NULL ||
output->pending.buffer_type == WLR_OUTPUT_STATE_BUFFER_RENDER;
output_damage->pending_attach_render = output->back_buffer != NULL;
}
}