diff options
| author | Simon Ser <contact@emersion.fr> | 2023-06-22 15:48:35 +0200 |
|---|---|---|
| committer | Alexander Orzechowski <alex@ozal.ski> | 2023-06-23 18:07:26 +0000 |
| commit | be050979684ae8779a56e4b0166cfb21d1935d35 (patch) | |
| tree | c4a77ff1363875abb59508b3b3a5cdff28dbb895 /backend/drm | |
| parent | 8a5b5e6f28dae650df36a271213655b8bdf52dbf (diff) | |
output: add wlr_output_state_init()
This changes the semantics of wlr_output_state. Instead of having
fields with uninitialized memory when missing from the committed
bitflag, all fields are always initialized (and maybe NULL/empty),
just like we do in wlr_surface_state. This reduces the chances of
footguns when reading a field, and removes the need to check for
the committed bitfield everywhere.
A new wlr_output_state_init() function takes care of initializing
the Pixman region.
Diffstat (limited to 'backend/drm')
| -rw-r--r-- | backend/drm/backend.c | 17 | ||||
| -rw-r--r-- | backend/drm/drm.c | 9 |
2 files changed, 12 insertions, 14 deletions
diff --git a/backend/drm/backend.c b/backend/drm/backend.c index 89240352..b3af3005 100644 --- a/backend/drm/backend.c +++ b/backend/drm/backend.c @@ -121,22 +121,21 @@ static void handle_session_active(struct wl_listener *listener, void *data) { struct wlr_drm_connector *conn; wl_list_for_each(conn, &drm->connectors, link) { struct wlr_output_mode *mode = NULL; - uint32_t committed = WLR_OUTPUT_STATE_ENABLED; if (conn->status != DRM_MODE_DISCONNECTED && conn->output.enabled && conn->output.current_mode != NULL) { - committed |= WLR_OUTPUT_STATE_MODE; mode = conn->output.current_mode; } - struct wlr_output_state state = { - .committed = committed, - .allow_artifacts = true, - .enabled = mode != NULL, - .mode_type = WLR_OUTPUT_STATE_MODE_FIXED, - .mode = mode, - }; + + struct wlr_output_state state; + wlr_output_state_init(&state); + wlr_output_state_set_enabled(&state, mode != NULL); + if (mode != NULL) { + wlr_output_state_set_mode(&state, mode); + } if (!drm_connector_commit_state(conn, &state)) { wlr_drm_conn_log(conn, WLR_ERROR, "Failed to restore state after VT switch"); } + wlr_output_state_finish(&state); } } else { wlr_log(WLR_INFO, "DRM fd paused"); diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 22bc6681..7ead82ab 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -1155,16 +1155,15 @@ static void dealloc_crtc(struct wlr_drm_connector *conn) { wlr_drm_conn_log(conn, WLR_DEBUG, "De-allocating CRTC %" PRIu32, conn->crtc->id); - struct wlr_output_state state = { - .committed = WLR_OUTPUT_STATE_ENABLED, - .allow_artifacts = true, - .enabled = false, - }; + struct wlr_output_state state; + wlr_output_state_init(&state); + wlr_output_state_set_enabled(&state, false); if (!drm_connector_commit_state(conn, &state)) { // On GPU unplug, disabling the CRTC can fail with EPERM wlr_drm_conn_log(conn, WLR_ERROR, "Failed to disable CRTC %"PRIu32, conn->crtc->id); } + wlr_output_state_finish(&state); } static void realloc_crtcs(struct wlr_drm_backend *drm, |