Merge branch 'master' into wlr-buffer

This commit is contained in:
emersion 2018-06-09 17:54:47 +01:00
commit 9ea5b1a85e
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
3 changed files with 97 additions and 57 deletions

View file

@ -16,12 +16,13 @@ struct wlr_egl {
const char *exts_str;
struct {
bool buffer_age;
bool swap_buffers_with_damage;
bool dmabuf_import;
bool dmabuf_import_modifiers;
bool bind_wayland_display;
} egl_exts;
bool buffer_age;
bool dmabuf_import_modifiers;
bool dmabuf_import;
bool image_base;
bool swap_buffers_with_damage;
} exts;
struct wl_display *wl_display;
};