blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #1338 from emersion/wayland-swap-interval 

render: on Wayland, make eglSwapBuffers non-blocking
This commit is contained in:
Drew DeVault 2018-10-28 12:33:59 +01:00 committed by GitHub
parent 2ae2c247a0 b42fc4f2b1
commit e3ec1be941
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
include/wlr/render/egl.h
View File

@ -17,6 +17,7 @@
#include <wlr/render/dmabuf.h> #include <wlr/render/dmabuf.h>
struct wlr_egl { struct wlr_egl {
EGLenum platform;
EGLDisplay display; EGLDisplay display;
EGLConfig config; EGLConfig config;
EGLContext context; EGLContext context;

7
render/egl.c
View File

@ -130,6 +130,8 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *remote_display,
goto error; goto error;
} }
egl->platform = platform;
EGLint major, minor; EGLint major, minor;
if (eglInitialize(egl->display, &major, &minor) == EGL_FALSE) { if (eglInitialize(egl->display, &major, &minor) == EGL_FALSE) {
wlr_log(WLR_ERROR, "Failed to initialize EGL"); 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, bool wlr_egl_swap_buffers(struct wlr_egl *egl, EGLSurface surface,
pixman_region32_t *damage) { pixman_region32_t *damage) {
// Never block when swapping buffers on Wayland
if (egl->platform == EGL_PLATFORM_WAYLAND_EXT) {
eglSwapInterval(egl->display, 0);
}
EGLBoolean ret; EGLBoolean ret;
if (damage != NULL && (egl->exts.swap_buffers_with_damage_ext || if (damage != NULL && (egl->exts.swap_buffers_with_damage_ext ||
egl->exts.swap_buffers_with_damage_khr)) { egl->exts.swap_buffers_with_damage_khr)) {