diff options
| author | Simon Zeni <simon@bl4ckb0ne.ca> | 2021-01-07 00:10:10 -0500 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2021-01-07 17:11:22 +0100 |
| commit | b899a412e3eb7be76df495883de9aa2bdb3be06f (patch) | |
| tree | 0858d2aedf0c252d40ab0964642f286fd1ccb931 /include | |
| parent | 5773794baff0f1cf843f5585322834d050dd231b (diff) | |
| download | wlroots-b899a412e3eb7be76df495883de9aa2bdb3be06f.tar.xz | |
backend: remove wlr_egl from all backends
Diffstat (limited to 'include')
| -rw-r--r-- | include/backend/drm/renderer.h | 1 | ||||
| -rw-r--r-- | include/backend/headless.h | 3 | ||||
| -rw-r--r-- | include/backend/wayland.h | 1 | ||||
| -rw-r--r-- | include/backend/x11.h | 1 | ||||
| -rw-r--r-- | include/wlr/render/wlr_renderer.h | 2 |
5 files changed, 2 insertions, 6 deletions
diff --git a/include/backend/drm/renderer.h b/include/backend/drm/renderer.h index a22cc56a..e422ac4b 100644 --- a/include/backend/drm/renderer.h +++ b/include/backend/drm/renderer.h @@ -15,7 +15,6 @@ struct wlr_buffer; struct wlr_drm_renderer { struct wlr_drm_backend *backend; struct gbm_device *gbm; - struct wlr_egl egl; struct wlr_renderer *wlr_rend; struct wlr_gbm_allocator *allocator; diff --git a/include/backend/headless.h b/include/backend/headless.h index 4a29b033..bf15f5c7 100644 --- a/include/backend/headless.h +++ b/include/backend/headless.h @@ -8,8 +8,6 @@ struct wlr_headless_backend { struct wlr_backend backend; - struct wlr_egl priv_egl; // may be uninitialized - struct wlr_egl *egl; struct wlr_renderer *renderer; struct wlr_allocator *allocator; struct wlr_drm_format *format; @@ -19,6 +17,7 @@ struct wlr_headless_backend { struct wl_list input_devices; struct wl_listener display_destroy; struct wl_listener renderer_destroy; + bool has_parent_renderer; bool started; }; diff --git a/include/backend/wayland.h b/include/backend/wayland.h index 1c874b35..dc9670f5 100644 --- a/include/backend/wayland.h +++ b/include/backend/wayland.h @@ -21,7 +21,6 @@ struct wlr_wl_backend { struct wl_display *local_display; struct wl_list devices; struct wl_list outputs; - struct wlr_egl egl; struct wlr_renderer *renderer; struct wlr_drm_format *format; struct wlr_allocator *allocator; diff --git a/include/backend/x11.h b/include/backend/x11.h index e952587d..db6e5870 100644 --- a/include/backend/x11.h +++ b/include/backend/x11.h @@ -77,7 +77,6 @@ struct wlr_x11_backend { struct wlr_keyboard keyboard; struct wlr_input_device keyboard_dev; - struct wlr_egl egl; struct wlr_renderer *renderer; struct wlr_drm_format_set dri3_formats; const struct wlr_x11_format *x11_format; diff --git a/include/wlr/render/wlr_renderer.h b/include/wlr/render/wlr_renderer.h index 22c37b77..c736722a 100644 --- a/include/wlr/render/wlr_renderer.h +++ b/include/wlr/render/wlr_renderer.h @@ -33,7 +33,7 @@ struct wlr_renderer { } events; }; -struct wlr_renderer *wlr_renderer_autocreate(struct wlr_egl *egl, EGLenum platform, +struct wlr_renderer *wlr_renderer_autocreate(EGLenum platform, void *remote_display); void wlr_renderer_begin(struct wlr_renderer *r, uint32_t width, uint32_t height); |