aboutsummaryrefslogtreecommitdiff
path: root/render
diff options
context:
space:
mode:
Diffstat (limited to 'render')
-rw-r--r--render/egl.c20
-rw-r--r--render/gles2/renderer.c11
2 files changed, 13 insertions, 18 deletions
diff --git a/render/egl.c b/render/egl.c
index 7f88880c..b01f7d54 100644
--- a/render/egl.c
+++ b/render/egl.c
@@ -156,7 +156,7 @@ out:
free(formats);
}
-struct wlr_egl *wlr_egl_create(EGLenum platform, void *remote_display) {
+struct wlr_egl *wlr_egl_create_with_drm_fd(int drm_fd) {
struct wlr_egl *egl = calloc(1, sizeof(struct wlr_egl));
if (egl == NULL) {
wlr_log_errno(WLR_ERROR, "Allocation failed");
@@ -173,11 +173,9 @@ struct wlr_egl *wlr_egl_create(EGLenum platform, void *remote_display) {
return NULL;
}
- if (platform == EGL_PLATFORM_GBM_KHR) {
- if (!check_egl_ext(client_exts_str, "EGL_KHR_platform_gbm")) {
- wlr_log(WLR_ERROR, "EGL_KHR_platform_gbm not supported");
- return NULL;
- }
+ if (!check_egl_ext(client_exts_str, "EGL_KHR_platform_gbm")) {
+ wlr_log(WLR_ERROR, "EGL_KHR_platform_gbm not supported");
+ return NULL;
}
if (!check_egl_ext(client_exts_str, "EGL_EXT_platform_base")) {
@@ -206,8 +204,14 @@ struct wlr_egl *wlr_egl_create(EGLenum platform, void *remote_display) {
goto error;
}
- egl->display = egl->procs.eglGetPlatformDisplayEXT(platform,
- remote_display, NULL);
+ egl->gbm_device = gbm_create_device(drm_fd);
+ if (!egl->gbm_device) {
+ wlr_log(WLR_ERROR, "Failed to create GBM device");
+ goto error;
+ }
+
+ egl->display = egl->procs.eglGetPlatformDisplayEXT(EGL_PLATFORM_GBM_KHR,
+ egl->gbm_device, NULL);
if (egl->display == EGL_NO_DISPLAY) {
wlr_log(WLR_ERROR, "Failed to create EGL display");
goto error;
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c
index e0534749..9bfaebd7 100644
--- a/render/gles2/renderer.c
+++ b/render/gles2/renderer.c
@@ -733,21 +733,12 @@ extern const GLchar tex_fragment_src_rgbx[];
extern const GLchar tex_fragment_src_external[];
struct wlr_renderer *wlr_gles2_renderer_create_with_drm_fd(int drm_fd) {
- struct gbm_device *gbm_device = gbm_create_device(drm_fd);
- if (!gbm_device) {
- wlr_log(WLR_ERROR, "Failed to create GBM device");
- return NULL;
- }
-
- struct wlr_egl *egl = wlr_egl_create(EGL_PLATFORM_GBM_KHR, gbm_device);
+ struct wlr_egl *egl = wlr_egl_create_with_drm_fd(drm_fd);
if (egl == NULL) {
wlr_log(WLR_ERROR, "Could not initialize EGL");
- gbm_device_destroy(gbm_device);
return NULL;
}
- 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");