diff options
| author | Drew DeVault <sir@cmpwn.com> | 2018-03-31 21:31:15 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-03-31 21:31:15 -0400 |
| commit | b60e31e5c034c87a5b3b01862d2ea535ef7de31c (patch) | |
| tree | 335d648f02305c4c37359d2e7fcfcffbddb78534 /backend | |
| parent | 1b258ffceb489a8ef339773ef23b1ac65f8774bd (diff) | |
| parent | 33a2eb4b7775d1a3ab2b767739c1f1f054683d22 (diff) | |
Merge pull request #794 from emersion/renderer-untie-backend
Untie wlr_backend from wlr_renderer
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/drm/renderer.c | 2 | ||||
| -rw-r--r-- | backend/headless/backend.c | 2 | ||||
| -rw-r--r-- | backend/wayland/backend.c | 2 | ||||
| -rw-r--r-- | backend/x11/backend.c | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c index c1531ce3..f06de1ee 100644 --- a/backend/drm/renderer.c +++ b/backend/drm/renderer.c @@ -31,7 +31,7 @@ bool wlr_drm_renderer_init(struct wlr_drm_backend *drm, goto error_gbm; } - renderer->wlr_rend = wlr_gles2_renderer_create(&drm->backend); + renderer->wlr_rend = wlr_gles2_renderer_create(&renderer->egl); if (!renderer->wlr_rend) { wlr_log(L_ERROR, "Failed to create WLR renderer"); goto error_egl; diff --git a/backend/headless/backend.c b/backend/headless/backend.c index 663bc13b..5bc48240 100644 --- a/backend/headless/backend.c +++ b/backend/headless/backend.c @@ -114,7 +114,7 @@ struct wlr_backend *wlr_headless_backend_create(struct wl_display *display) { return NULL; } - backend->renderer = wlr_gles2_renderer_create(&backend->backend); + backend->renderer = wlr_gles2_renderer_create(&backend->egl); if (backend->renderer == NULL) { wlr_log(L_ERROR, "Failed to create renderer"); } diff --git a/backend/wayland/backend.c b/backend/wayland/backend.c index abb25df5..0135f7c5 100644 --- a/backend/wayland/backend.c +++ b/backend/wayland/backend.c @@ -212,7 +212,7 @@ struct wlr_backend *wlr_wl_backend_create(struct wl_display *display, const char backend->remote_display, NULL, WL_SHM_FORMAT_ARGB8888); wlr_egl_bind_display(&backend->egl, backend->local_display); - backend->renderer = wlr_gles2_renderer_create(&backend->backend); + backend->renderer = wlr_gles2_renderer_create(&backend->egl); if (backend->renderer == NULL) { wlr_log_errno(L_ERROR, "Could not create renderer"); } diff --git a/backend/x11/backend.c b/backend/x11/backend.c index 90658f26..f598aea1 100644 --- a/backend/x11/backend.c +++ b/backend/x11/backend.c @@ -314,7 +314,7 @@ struct wlr_backend *wlr_x11_backend_create(struct wl_display *display, goto error_event; } - x11->renderer = wlr_gles2_renderer_create(&x11->backend); + x11->renderer = wlr_gles2_renderer_create(&x11->egl); if (x11->renderer == NULL) { wlr_log(L_ERROR, "Failed to create renderer"); goto error_egl; |