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

render: unconditionally read WLR_RENDERER 

Prior to this commit, WLR_RENDERER was only looked up when the
backend returned a DRM FD.

Make it so WLR_RENDERER is always looked up, so that running wlroots
on a system without a GPU and with WLR_RENDERER=gles2 fails as
expected instead of falling back to the Pixman renderer.
This commit is contained in:
Simon Ser 2021-04-21 08:23:06 +02:00
parent 8a27050b4e
commit af78ecb86b
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
render/wlr_renderer.c
View File

@ -231,6 +231,11 @@ struct wlr_renderer *wlr_renderer_autocreate_with_drm_fd(int drm_fd) {
if (name) { if (name) {
#if WLR_HAS_GLES2_RENDERER #if WLR_HAS_GLES2_RENDERER
if (strcmp(name, "gles2") == 0) { if (strcmp(name, "gles2") == 0) {
if (drm_fd < 0) {
wlr_log(WLR_ERROR, "Cannot create GLES2 renderer: "
"no DRM FD available");
return NULL;
}
return wlr_gles2_renderer_create_with_drm_fd(drm_fd); return wlr_gles2_renderer_create_with_drm_fd(drm_fd);
} }
#endif #endif
@ -244,10 +249,14 @@ struct wlr_renderer *wlr_renderer_autocreate_with_drm_fd(int drm_fd) {
struct wlr_renderer *renderer = NULL; struct wlr_renderer *renderer = NULL;
#if WLR_HAS_GLES2_RENDERER #if WLR_HAS_GLES2_RENDERER
if ((renderer = wlr_gles2_renderer_create_with_drm_fd(drm_fd)) != NULL) { if (drm_fd >= 0) {
return renderer; if ((renderer = wlr_gles2_renderer_create_with_drm_fd(drm_fd)) != NULL) {
return renderer;
}
wlr_log(WLR_DEBUG, "Failed to create GLES2 renderer");
} else {
wlr_log(WLR_DEBUG, "Skipping GLES2 renderer: no DRM FD available");
} }
wlr_log(WLR_DEBUG, "Failed to create gles2 renderer");
#endif #endif
if ((renderer = wlr_pixman_renderer_create()) != NULL) { if ((renderer = wlr_pixman_renderer_create()) != NULL) {
@ -260,13 +269,8 @@ struct wlr_renderer *wlr_renderer_autocreate_with_drm_fd(int drm_fd) {
} }
struct wlr_renderer *wlr_renderer_autocreate(struct wlr_backend *backend) { struct wlr_renderer *wlr_renderer_autocreate(struct wlr_backend *backend) {
// Note, drm_fd may be negative if unavailable
int drm_fd = wlr_backend_get_drm_fd(backend); int drm_fd = wlr_backend_get_drm_fd(backend);
if (drm_fd < 0) {
wlr_log(WLR_ERROR, "Failed to get DRM FD from backend");
wlr_log(WLR_INFO, "Falling back on pixman renderer");
return wlr_pixman_renderer_create();
}
return wlr_renderer_autocreate_with_drm_fd(drm_fd); return wlr_renderer_autocreate_with_drm_fd(drm_fd);
} }