diff options
Diffstat (limited to 'render')
| -rw-r--r-- | render/gles2/renderer.c | 4 | ||||
| -rw-r--r-- | render/wlr_renderer.c | 16 |
2 files changed, 14 insertions, 6 deletions
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index 65c2b801..9df21fcc 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -351,13 +351,15 @@ static struct wlr_texture *gles2_texture_from_dmabuf( return wlr_gles2_texture_from_dmabuf(renderer->egl, attribs); } -static void gles2_init_wl_display(struct wlr_renderer *wlr_renderer, +static bool gles2_init_wl_display(struct wlr_renderer *wlr_renderer, struct wl_display *wl_display) { struct wlr_gles2_renderer *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"); + return false; } + return true; } struct wlr_egl *wlr_gles2_renderer_get_egl(struct wlr_renderer *wlr_renderer) { diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c index eaf630c3..b12f4b3a 100644 --- a/render/wlr_renderer.c +++ b/render/wlr_renderer.c @@ -160,18 +160,18 @@ bool wlr_renderer_format_supported(struct wlr_renderer *r, return r->impl->format_supported(r, fmt); } -void wlr_renderer_init_wl_display(struct wlr_renderer *r, +bool wlr_renderer_init_wl_display(struct wlr_renderer *r, struct wl_display *wl_display) { if (wl_display_init_shm(wl_display)) { wlr_log(WLR_ERROR, "Failed to initialize shm"); - return; + return false; } size_t len; const enum wl_shm_format *formats = wlr_renderer_get_formats(r, &len); if (formats == NULL) { wlr_log(WLR_ERROR, "Failed to initialize shm: cannot get formats"); - return; + return false; } for (size_t i = 0; i < len; ++i) { @@ -183,12 +183,18 @@ void wlr_renderer_init_wl_display(struct wlr_renderer *r, } if (r->impl->texture_from_dmabuf) { - wlr_linux_dmabuf_v1_create(wl_display, r); + if (wlr_linux_dmabuf_v1_create(wl_display, r) == NULL) { + return false; + } } if (r->impl->init_wl_display) { - r->impl->init_wl_display(r, wl_display); + if (!r->impl->init_wl_display(r, wl_display)) { + return false; + } } + + return true; } struct wlr_renderer *wlr_renderer_autocreate(struct wlr_egl *egl, |