diff options
| author | Drew DeVault <sir@cmpwn.com> | 2017-09-27 20:25:34 -0400 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2017-09-27 20:25:34 -0400 |
| commit | 7cf4ee128e278108b0326344be01ded93ce7148b (patch) | |
| tree | c5d7291b1aebf130c701af6936c7cc5614383c45 /render | |
| parent | 38bb3b960852f9e358ec40c516f99eafeaf83ab2 (diff) | |
| parent | d7d73cd2985d4c5d1fdadcfb63680c638e29a4a0 (diff) | |
Merge remote-tracking branch 'origin/master' into rootston
Diffstat (limited to 'render')
| -rw-r--r-- | render/egl.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/render/egl.c b/render/egl.c index 2db8d4c0..048626ba 100644 --- a/render/egl.c +++ b/render/egl.c @@ -175,13 +175,14 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, return true; error: + eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); eglTerminate(egl->display); eglReleaseThread(); - eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); return false; } void wlr_egl_free(struct wlr_egl *egl) { + eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); if (egl->wl_display && egl->eglUnbindWaylandDisplayWL) { egl->eglUnbindWaylandDisplayWL(egl->display, egl->wl_display); } @@ -189,7 +190,6 @@ void wlr_egl_free(struct wlr_egl *egl) { eglDestroyContext(egl->display, egl->context); eglTerminate(egl->display); eglReleaseThread(); - eglMakeCurrent(EGL_NO_DISPLAY, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); } bool wlr_egl_bind_display(struct wlr_egl *egl, struct wl_display *local_display) { |