diff options
| author | Simon Ser <contact@emersion.fr> | 2020-05-19 11:54:59 +0200 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2020-05-19 14:56:20 +0200 |
| commit | 1edc42157bbb01b25ec27750f883fd84ee5908d6 (patch) | |
| tree | 068205ea52bf4c76a86e96f19862f794852937d0 /backend/headless/output.c | |
| parent | 781ed1ff02e38dffdfebca0fa80baa1791849c3b (diff) | |
render/egl: introduce wlr_egl_unset_current
This function can be called after wlr_egl_make_current to cleanup the
EGL context. This avoids having lingering EGL contexts that make things
work by chance.
Closes: https://github.com/swaywm/wlroots/issues/2197
Diffstat (limited to 'backend/headless/output.c')
| -rw-r--r-- | backend/headless/output.c | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/backend/headless/output.c b/backend/headless/output.c index dc0a1478..822afac9 100644 --- a/backend/headless/output.c +++ b/backend/headless/output.c @@ -35,6 +35,8 @@ static bool create_fbo(struct wlr_headless_output *output, GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER); glBindFramebuffer(GL_FRAMEBUFFER, 0); + wlr_egl_unset_current(output->backend->egl); + if (status != GL_FRAMEBUFFER_COMPLETE) { wlr_log(WLR_ERROR, "Failed to create FBO"); return false; @@ -52,6 +54,9 @@ static void destroy_fbo(struct wlr_headless_output *output) { glDeleteFramebuffers(1, &output->fbo); glDeleteRenderbuffers(1, &output->rbo); + + wlr_egl_unset_current(output->backend->egl); + output->fbo = 0; output->rbo = 0; } @@ -125,21 +130,23 @@ static bool output_commit(struct wlr_output *wlr_output) { } if (wlr_output->pending.committed & WLR_OUTPUT_STATE_BUFFER) { + glBindFramebuffer(GL_FRAMEBUFFER, 0); + wlr_egl_unset_current(output->backend->egl); + // Nothing needs to be done for FBOs wlr_output_send_present(wlr_output, NULL); } - wlr_egl_make_current(output->backend->egl, EGL_NO_SURFACE, NULL); - glBindFramebuffer(GL_FRAMEBUFFER, 0); - return true; } static void output_rollback(struct wlr_output *wlr_output) { struct wlr_headless_output *output = headless_output_from_output(wlr_output); - wlr_egl_make_current(output->backend->egl, EGL_NO_SURFACE, NULL); - glBindFramebuffer(GL_FRAMEBUFFER, 0); + if (wlr_output->pending.committed & WLR_OUTPUT_STATE_BUFFER) { + glBindFramebuffer(GL_FRAMEBUFFER, 0); + wlr_egl_unset_current(output->backend->egl); + } } static void output_destroy(struct wlr_output *wlr_output) { |