mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2026-04-18 06:47:31 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

wlr_output: Introduce struct wlr_output_commit

Browse source
This commit is contained in:
Alexander Orzechowski 2023-10-03 05:40:50 -04:00
parent 1b0694b794
commit c299c13d13
12 changed files with 145 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

33
backend/wayland/output.c
View file

@ -1,3 +1,4 @@
#define _POSIX_C_SOURCE 200809L
#include <assert.h>
#include <stdint.h>
#include <stdio.h>
@ -6,6 +7,7 @@
#include <sys/mman.h>
#include <sys/types.h>
#include <unistd.h>
#include <time.h>
#include <drm_fourcc.h>
#include <wayland-client.h>
@ -103,12 +105,14 @@ static void presentation_feedback_handle_presented(void *data,
struct wlr_output_event_present event = {
.commit_seq = feedback->commit_seq,
.presented = true,
.output = &feedback->output->wlr_output,
.when = &t,
.seq = ((uint64_t)seq_hi << 32) | seq_lo,
.refresh = refresh_ns,
.flags = flags,
};
wlr_output_send_present(&feedback->output->wlr_output, &event);
wl_signal_emit_mutable(&feedback->commit.events.present, &event);
presentation_feedback_destroy(feedback);
}
@ -120,8 +124,10 @@ static void presentation_feedback_handle_discarded(void *data,
struct wlr_output_event_present event = {
.commit_seq = feedback->commit_seq,
.presented = false,
.output = &feedback->output->wlr_output,
};
wlr_output_send_present(&feedback->output->wlr_output, &event);
wl_signal_emit_mutable(&feedback->commit.events.present, &event);
presentation_feedback_destroy(feedback);
}
@ -520,13 +526,13 @@ static bool commit_layers(struct wlr_wl_output *output,
return true;
}
static bool output_commit(struct wlr_output *wlr_output,
static struct wlr_output_commit *output_commit(struct wlr_output *wlr_output,
const struct wlr_output_state *state) {
struct wlr_wl_output *output =
get_wl_output_from_output(wlr_output);
if (!output_test(wlr_output, state)) {
return false;
return NULL;
}
if ((state->committed & WLR_OUTPUT_STATE_ENABLED) && !state->enabled) {
@ -544,7 +550,7 @@ static bool output_commit(struct wlr_output *wlr_output,
struct wlr_wl_buffer *buffer =
get_or_create_wl_buffer(output->backend, wlr_buffer);
if (buffer == NULL) {
return false;
return NULL;
}
wl_surface_attach(output->surface, buffer->wl_buffer, 0, 0);
@ -553,9 +559,11 @@ static bool output_commit(struct wlr_output *wlr_output,
if ((state->committed & WLR_OUTPUT_STATE_LAYERS) &&
!commit_layers(output, state->layers, state->layers_len)) {
return false;
return NULL;
}
struct wlr_output_commit *commit = NULL;
if (output_pending_enabled(wlr_output, state)) {
if (output->frame_callback != NULL) {
wl_callback_destroy(output->frame_callback);
@ -576,7 +584,7 @@ static bool output_commit(struct wlr_output *wlr_output,
calloc(1, sizeof(*feedback));
if (feedback == NULL) {
wp_presentation_feedback_destroy(wp_feedback);
return false;
return NULL;
}
feedback->output = output;
feedback->feedback = wp_feedback;
@ -585,18 +593,21 @@ static bool output_commit(struct wlr_output *wlr_output,
wp_presentation_feedback_add_listener(wp_feedback,
&presentation_feedback_listener, feedback);
commit = &feedback->commit;
wlr_output_commit_init(commit, wlr_output);
} else {
struct wlr_output_event_present present_event = {
.commit_seq = wlr_output->commit_seq + 1,
.presented = true,
};
output_defer_present(wlr_output, present_event);
wlr_output_commit_init(commit, wlr_output);
output_commit_defer_present(commit);
}
} else {
commit = &output->commit;
wlr_output_commit_init(commit, wlr_output);
}
wl_display_flush(output->backend->remote_display);
return true;
return commit;
}
static bool output_set_cursor(struct wlr_output *wlr_output,