diff options
| author | Simon Ser <contact@emersion.fr> | 2021-07-12 18:01:40 +0200 |
|---|---|---|
| committer | Simon Zeni <simon@bl4ckb0ne.ca> | 2021-07-29 09:48:33 -0400 |
| commit | 3132c0ab107d0251652fe1cb43830d5d0cc57e8f (patch) | |
| tree | 54208a9720aa82098ba3c84ff4606c4acac68b8e /backend | |
| parent | f211bc983aeeacd7f4d6af8c47845e8ddc2f7e9b (diff) | |
output: drop wlr_output_state.buffer_type
This is now unconditionally set to WLR_OUTPUT_STATE_BUFFER_SCANOUT.
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/drm/drm.c | 1 | ||||
| -rw-r--r-- | backend/wayland/output.c | 4 | ||||
| -rw-r--r-- | backend/x11/output.c | 3 |
3 files changed, 0 insertions, 8 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c index ed301b25..e7628e2d 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -396,7 +396,6 @@ static bool drm_connector_set_pending_fb(struct wlr_drm_connector *conn, struct wlr_drm_plane *plane = crtc->primary; assert(state->committed & WLR_OUTPUT_STATE_BUFFER); - assert(state->buffer_type == WLR_OUTPUT_STATE_BUFFER_SCANOUT); struct wlr_buffer *local_buf; if (drm->parent) { diff --git a/backend/wayland/output.c b/backend/wayland/output.c index d0f5f6dd..16eb17f5 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -261,7 +261,6 @@ static bool output_test(struct wlr_output *wlr_output) { } if ((wlr_output->pending.committed & WLR_OUTPUT_STATE_BUFFER) && - wlr_output->pending.buffer_type == WLR_OUTPUT_STATE_BUFFER_SCANOUT && !test_buffer(output->backend, wlr_output->pending.buffer)) { return false; } @@ -287,9 +286,6 @@ static bool output_commit(struct wlr_output *wlr_output) { } if (wlr_output->pending.committed & WLR_OUTPUT_STATE_BUFFER) { - assert(wlr_output->pending.buffer_type == - WLR_OUTPUT_STATE_BUFFER_SCANOUT); - struct wp_presentation_feedback *wp_feedback = NULL; if (output->backend->presentation != NULL) { wp_feedback = wp_presentation_feedback(output->backend->presentation, diff --git a/backend/x11/output.c b/backend/x11/output.c index 44219dde..2f996c10 100644 --- a/backend/x11/output.c +++ b/backend/x11/output.c @@ -257,9 +257,6 @@ static struct wlr_x11_buffer *get_or_create_x11_buffer( static bool output_commit_buffer(struct wlr_x11_output *output) { struct wlr_x11_backend *x11 = output->x11; - assert(output->wlr_output.pending.buffer_type == - WLR_OUTPUT_STATE_BUFFER_SCANOUT); - struct wlr_buffer *buffer = output->wlr_output.pending.buffer; struct wlr_x11_buffer *x11_buffer = get_or_create_x11_buffer(output, buffer); |