diff options
| author | Simon Ser <contact@emersion.fr> | 2019-04-22 12:42:37 +0300 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2019-04-23 14:34:30 -0600 |
| commit | 23e37e7b1d8004fb5361c147239d2e628efbd5e8 (patch) | |
| tree | cca1f5be5b7b0c750e7ec104c500ce1311d89d19 /tinywl | |
| parent | 56ceed38bffcc741b5a80741d0207101905370ae (diff) | |
output: refactor frame submission API
This is necessary for direct scan-out and other upcoming features. This patch
changes the output API to look like the wl_surface API.
Outputs now have some double-buffered state: the frame to be submitted
(currently only wlr_renderer frames are supported) and the damaged region.
To attach a pending frame, use wlr_output_attach_render. To set the pending
damaged region, use wlr_output_set_damage.
To submit the pending state, call wlr_output_commit. This will submit the
pending frame to the backend.
To migrate from the old API to the new one:
- Replace wlr_output_make_current calls by wlr_output_attach_render
- Replace wlr_output_swap_buffers calls by wlr_output_set_damage and
wlr_output_commit
Diffstat (limited to 'tinywl')
| -rw-r--r-- | tinywl/tinywl.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tinywl/tinywl.c b/tinywl/tinywl.c index 16c1f85c..ca5cdc91 100644 --- a/tinywl/tinywl.c +++ b/tinywl/tinywl.c @@ -591,8 +591,8 @@ static void output_frame(struct wl_listener *listener, void *data) { struct timespec now; clock_gettime(CLOCK_MONOTONIC, &now); - /* wlr_output_make_current makes the OpenGL context current. */ - if (!wlr_output_make_current(output->wlr_output, NULL)) { + /* wlr_output_attach_render makes the OpenGL context current. */ + if (!wlr_output_attach_render(output->wlr_output, NULL)) { return; } /* The "effective" resolution can change if you rotate your outputs. */ @@ -635,7 +635,7 @@ static void output_frame(struct wl_listener *listener, void *data) { /* Conclude rendering and swap the buffers, showing the final frame * on-screen. */ wlr_renderer_end(renderer); - wlr_output_swap_buffers(output->wlr_output, NULL, NULL); + wlr_output_commit(output->wlr_output); } static void server_new_output(struct wl_listener *listener, void *data) { |