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

render: introduce WLR_RENDERER in wlr_renderer_autocreate_with_drm_fd 

This env var forces the creation of a specific renderer. If no renderer
is specified, the function will try to create all of the renderers one
by one until one is created successfuly.
This commit is contained in:
Simon Zeni 2021-04-20 14:48:52 -04:00 committed by Simon Ser
parent 10c5199d85
commit cdacf4f632
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/env_vars.md
View File

@ -9,6 +9,8 @@ wlroots reads these environment variables
* *WLR_DIRECT_TTY*: specifies the tty to be used (instead of using /dev/tty) * *WLR_DIRECT_TTY*: specifies the tty to be used (instead of using /dev/tty)
* *WLR_XWAYLAND*: specifies the path to an Xwayland binary to be used (instead * *WLR_XWAYLAND*: specifies the path to an Xwayland binary to be used (instead
of following shell search semantics for "Xwayland") of following shell search semantics for "Xwayland")
* *WLR_RENDERER*: forces the creation of a specified renderer (available
renderers: gles2, pixman)
## DRM backend ## DRM backend

43
render/wlr_renderer.c
View File

@ -1,7 +1,6 @@
#include <assert.h> #include <assert.h>
#include <stdbool.h> #include <stdbool.h>
#include <stdlib.h> #include <stdlib.h>
#include <gbm.h>
#include <wlr/render/interface.h> #include <wlr/render/interface.h>
#include <wlr/render/pixman.h> #include <wlr/render/pixman.h>
#include <wlr/render/wlr_renderer.h> #include <wlr/render/wlr_renderer.h>
@ -228,33 +227,35 @@ bool wlr_renderer_init_wl_display(struct wlr_renderer *r,
} }
struct wlr_renderer *wlr_renderer_autocreate_with_drm_fd(int drm_fd) { struct wlr_renderer *wlr_renderer_autocreate_with_drm_fd(int drm_fd) {
const char *name = getenv("WLR_RENDERER");
if (name) {
#if WLR_HAS_GLES2_RENDERER #if WLR_HAS_GLES2_RENDERER
struct gbm_device *gbm_device = gbm_create_device(drm_fd); if (strcmp(name, "gles2") == 0) {
if (!gbm_device) { return wlr_gles2_renderer_create_with_drm_fd(drm_fd);
wlr_log(WLR_ERROR, "Failed to create GBM device"); }
#endif
if (strcmp(name, "pixman") == 0) {
return wlr_pixman_renderer_create();
}
wlr_log(WLR_ERROR, "Invalid WLR_RENDERER value: '%s'", name);
return NULL; return NULL;
} }
struct wlr_egl *egl = wlr_egl_create(EGL_PLATFORM_GBM_KHR, gbm_device); struct wlr_renderer *renderer = NULL;
if (egl == NULL) { #if WLR_HAS_GLES2_RENDERER
wlr_log(WLR_ERROR, "Could not initialize EGL"); if ((renderer = wlr_gles2_renderer_create_with_drm_fd(drm_fd)) != NULL) {
gbm_device_destroy(gbm_device); return renderer;
return NULL;
} }
wlr_log(WLR_DEBUG, "Failed to create gles2 renderer");
egl->gbm_device = gbm_device;
struct wlr_renderer *renderer = wlr_gles2_renderer_create(egl);
if (!renderer) {
wlr_log(WLR_ERROR, "Failed to create GLES2 renderer");
wlr_egl_destroy(egl);
return NULL;
}
return renderer;
#endif #endif
wlr_log(WLR_ERROR, "Failed to initialize any renderer"); if ((renderer = wlr_pixman_renderer_create()) != NULL) {
return renderer;
}
wlr_log(WLR_DEBUG, "Failed to create pixman renderer");
wlr_log(WLR_ERROR, "Could not initialize renderer");
return NULL; return NULL;
} }