diff options
author | Simon Ser <contact@emersion.fr> | 2020-04-06 11:43:58 +0200 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2020-04-08 17:33:00 +0200 |
commit | d3bd5f2a7ba83567983c4a53ee6a69c3f8f6b25f (patch) | |
tree | efa3825bccd17ee283c087d1c330fa67bb14d97d | |
parent | 6977f3a843c7a9fc7b7cd4a5d75232c583132cf8 (diff) |
backend: reset EGL surface after buffer swap
This prevents GL commands to affect a previously current EGL surface
after a buffer swap.
-rw-r--r-- | backend/drm/drm.c | 2 | ||||
-rw-r--r-- | backend/headless/output.c | 5 | ||||
-rw-r--r-- | backend/wayland/output.c | 2 | ||||
-rw-r--r-- | backend/x11/output.c | 2 |
4 files changed, 11 insertions, 0 deletions
diff --git a/backend/drm/drm.c b/backend/drm/drm.c index 47423dcb..3bdb288e 100644 --- a/backend/drm/drm.c +++ b/backend/drm/drm.c @@ -569,6 +569,8 @@ static bool drm_connector_commit(struct wlr_output *output) { } } + wlr_egl_make_current(&drm->renderer.egl, EGL_NO_SURFACE, NULL); + return true; } diff --git a/backend/headless/output.c b/backend/headless/output.c index 326c9605..18847af0 100644 --- a/backend/headless/output.c +++ b/backend/headless/output.c @@ -71,6 +71,9 @@ static bool output_test(struct wlr_output *wlr_output) { } static bool output_commit(struct wlr_output *wlr_output) { + struct wlr_headless_output *output = + headless_output_from_output(wlr_output); + if (!output_test(wlr_output)) { return false; } @@ -89,6 +92,8 @@ static bool output_commit(struct wlr_output *wlr_output) { wlr_output_send_present(wlr_output, NULL); } + wlr_egl_make_current(&output->backend->egl, EGL_NO_SURFACE, NULL); + return true; } diff --git a/backend/wayland/output.c b/backend/wayland/output.c index 59804dcf..ae58b584 100644 --- a/backend/wayland/output.c +++ b/backend/wayland/output.c @@ -297,6 +297,8 @@ static bool output_commit(struct wlr_output *wlr_output) { } } + wlr_egl_make_current(&output->backend->egl, EGL_NO_SURFACE, NULL); + return true; } diff --git a/backend/x11/output.c b/backend/x11/output.c index 6546c23e..4e016afe 100644 --- a/backend/x11/output.c +++ b/backend/x11/output.c @@ -157,6 +157,8 @@ static bool output_commit(struct wlr_output *wlr_output) { wlr_output_send_present(wlr_output, NULL); } + wlr_egl_make_current(&x11->egl, EGL_NO_SURFACE, NULL); + return true; } |