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

18
backend/drm/drm.c
View file

@ -699,12 +699,12 @@ bool drm_connector_supports_vrr(struct wlr_drm_connector *conn) {
return true;
}
bool drm_connector_commit_state(struct wlr_drm_connector *conn,
struct wlr_output_commit *drm_connector_commit_state(struct wlr_drm_connector *conn,
const struct wlr_output_state *base) {
struct wlr_drm_backend *drm = conn->backend;
if (!drm->session->active) {
return false;
return NULL;
}
bool ok = false;
@ -780,15 +780,21 @@ bool drm_connector_commit_state(struct wlr_drm_connector *conn,
out:
drm_connector_state_finish(&pending);
return ok;
if (!ok) {
return NULL;
}
wlr_output_commit_init(&conn->commit, &conn->output);
return &conn->commit;
}
static bool drm_connector_commit(struct wlr_output *output,
static struct wlr_output_commit *drm_connector_commit(struct wlr_output *output,
const struct wlr_output_state *state) {
struct wlr_drm_connector *conn = get_drm_connector_from_output(output);
if (!drm_connector_test(output, state)) {
return false;
return NULL;
}
return drm_connector_commit_state(conn, state);
@ -1711,6 +1717,7 @@ static void handle_page_flip(int fd, unsigned seq,
struct wlr_output_event_present present_event = {
/* The DRM backend guarantees that the presentation event will be for
* the last submitted frame. */
.output = &conn->output,
.commit_seq = conn->output.commit_seq,
.presented = drm->session->active,
.when = &present_time,
@ -1719,6 +1726,7 @@ static void handle_page_flip(int fd, unsigned seq,
.flags = present_flags,
};
wlr_output_send_present(&conn->output, &present_event);
wl_signal_emit_mutable(&conn->commit.events.present, &present_event);
if (drm->session->active) {
wlr_output_send_frame(&conn->output);