diff options
| author | Simon Ser <contact@emersion.fr> | 2021-01-14 12:45:07 +0100 |
|---|---|---|
| committer | Simon Ser <contact@emersion.fr> | 2021-01-16 09:06:17 +0100 |
| commit | afdf4dc890d512b4d56796451af5a76a18376c0e (patch) | |
| tree | f84b567ad6f70f98eca9834a9123f9ea61555ffd /backend/drm | |
| parent | 08a4c62aac9d9771197018a155a9d80d6f93d764 (diff) | |
| download | wlroots-afdf4dc890d512b4d56796451af5a76a18376c0e.tar.xz | |
render/gles2: make EGL context current in bind_buffer
Instead of requiring callers to manually make the EGL context current
before binding a buffer and unsetting it after unbinding a buffer, do
it inside wlr_renderer_bind_buffer.
This hides renderer-specific implementation details inside the
wlr_renderer interface. Non-GLES2 renderers may not use EGL.
This removes all EGL dependencies from the backends.
References: https://github.com/swaywm/wlroots/issues/2618
References: https://github.com/swaywm/wlroots/pull/2615#issuecomment-756687006
Diffstat (limited to 'backend/drm')
| -rw-r--r-- | backend/drm/renderer.c | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c index 5f3fa9b6..ec9975c5 100644 --- a/backend/drm/renderer.c +++ b/backend/drm/renderer.c @@ -8,8 +8,6 @@ #include <string.h> #include <unistd.h> #include <wayland-util.h> -#include <wlr/render/egl.h> -#include <wlr/render/gles2.h> #include <wlr/render/wlr_renderer.h> #include <wlr/types/wlr_matrix.h> #include <wlr/util/log.h> @@ -115,10 +113,6 @@ bool drm_surface_make_current(struct wlr_drm_surface *surf, return false; } - struct wlr_egl *egl = wlr_gles2_renderer_get_egl(surf->renderer->wlr_rend); - if (!wlr_egl_make_current(egl)) { - return false; - } if (!wlr_renderer_bind_buffer(surf->renderer->wlr_rend, surf->back_buffer)) { wlr_log(WLR_ERROR, "Failed to attach buffer to renderer"); return false; @@ -129,10 +123,8 @@ bool drm_surface_make_current(struct wlr_drm_surface *surf, void drm_surface_unset_current(struct wlr_drm_surface *surf) { assert(surf->back_buffer != NULL); - struct wlr_egl *egl = wlr_gles2_renderer_get_egl(surf->renderer->wlr_rend); wlr_renderer_bind_buffer(surf->renderer->wlr_rend, NULL); - wlr_egl_unset_current(egl); wlr_buffer_unlock(surf->back_buffer); surf->back_buffer = NULL; |