aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoremersion <contact@emersion.fr>2018-10-28 09:49:30 +0100
committeremersion <contact@emersion.fr>2018-10-28 09:58:20 +0100
commitb42fc4f2b104b555ef7aca75c4d0edc894d11478 (patch)
treed9d0c1f5da26310c77bf4138d3188dbf2af87e2a
parentf34b7f88006c3be5fc5283d86f206ac75cf20093 (diff)
render: on Wayland, make eglSwapBuffers non-blocking
-rw-r--r--include/wlr/render/egl.h1
-rw-r--r--render/egl.c7
2 files changed, 8 insertions, 0 deletions
diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h
index c42b0325..30de3d26 100644
--- a/include/wlr/render/egl.h
+++ b/include/wlr/render/egl.h
@@ -17,6 +17,7 @@
#include <wlr/render/dmabuf.h>
struct wlr_egl {
+ EGLenum platform;
EGLDisplay display;
EGLConfig config;
EGLContext context;
diff --git a/render/egl.c b/render/egl.c
index cfa37f20..644f94ac 100644
--- a/render/egl.c
+++ b/render/egl.c
@@ -130,6 +130,8 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *remote_display,
goto error;
}
+ egl->platform = platform;
+
EGLint major, minor;
if (eglInitialize(egl->display, &major, &minor) == EGL_FALSE) {
wlr_log(WLR_ERROR, "Failed to initialize EGL");
@@ -319,6 +321,11 @@ bool wlr_egl_is_current(struct wlr_egl *egl) {
bool wlr_egl_swap_buffers(struct wlr_egl *egl, EGLSurface surface,
pixman_region32_t *damage) {
+ // Never block when swapping buffers on Wayland
+ if (egl->platform == EGL_PLATFORM_WAYLAND_EXT) {
+ eglSwapInterval(egl->display, 0);
+ }
+
EGLBoolean ret;
if (damage != NULL && (egl->exts.swap_buffers_with_damage_ext ||
egl->exts.swap_buffers_with_damage_khr)) {