render/gles2: only call wlr_egl_bind_display if supported

This allows us to hard-fail if the extension is advertised but we fail
to enable it.
This commit is contained in:
Simon Ser 2020-04-08 14:56:05 +02:00 committed by Scott Anderson
parent 9acca4fc73
commit 4a1015faff
1 changed files with 8 additions and 3 deletions

View File

@ -355,9 +355,14 @@ static bool gles2_init_wl_display(struct wlr_renderer *wlr_renderer,
struct wl_display *wl_display) { struct wl_display *wl_display) {
struct wlr_gles2_renderer *renderer = struct wlr_gles2_renderer *renderer =
gles2_get_renderer(wlr_renderer); gles2_get_renderer(wlr_renderer);
if (!wlr_egl_bind_display(renderer->egl, wl_display)) {
wlr_log(WLR_INFO, "failed to bind wl_display to EGL"); if (renderer->egl->exts.bind_wayland_display_wl) {
return false; if (!wlr_egl_bind_display(renderer->egl, wl_display)) {
wlr_log(WLR_ERROR, "Failed to bind wl_display to EGL");
return false;
}
} else {
wlr_log(WLR_INFO, "EGL_WL_bind_wayland_display is not supported");
} }
return true; return true;
} }