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/x11 | |
| parent | 08a4c62aac9d9771197018a155a9d80d6f93d764 (diff) | |
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/x11')
| -rw-r--r-- | backend/x11/output.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/backend/x11/output.c b/backend/x11/output.c index 24b9c599..4f91a55f 100644 --- a/backend/x11/output.c +++ b/backend/x11/output.c @@ -13,8 +13,6 @@ #include <wlr/interfaces/wlr_output.h> #include <wlr/interfaces/wlr_pointer.h> #include <wlr/interfaces/wlr_touch.h> -#include <wlr/render/egl.h> -#include <wlr/render/gles2.h> #include <wlr/util/log.h> #include "backend/x11.h" @@ -99,7 +97,6 @@ static bool output_attach_render(struct wlr_output *wlr_output, int *buffer_age) { struct wlr_x11_output *output = get_x11_output_from_output(wlr_output); struct wlr_x11_backend *x11 = output->x11; - struct wlr_egl *egl = wlr_gles2_renderer_get_egl(x11->renderer); wlr_buffer_unlock(output->back_buffer); output->back_buffer = wlr_swapchain_acquire(output->swapchain, buffer_age); @@ -107,9 +104,6 @@ static bool output_attach_render(struct wlr_output *wlr_output, return false; } - if (!wlr_egl_make_current(egl)) { - return false; - } if (!wlr_renderer_bind_buffer(x11->renderer, output->back_buffer)) { return false; } @@ -207,12 +201,10 @@ static struct wlr_x11_buffer *get_or_create_x11_buffer( static bool output_commit_buffer(struct wlr_x11_output *output) { struct wlr_x11_backend *x11 = output->x11; - struct wlr_egl *egl = wlr_gles2_renderer_get_egl(x11->renderer); assert(output->back_buffer != NULL); wlr_renderer_bind_buffer(x11->renderer, NULL); - wlr_egl_unset_current(egl); struct wlr_x11_buffer *x11_buffer = get_or_create_x11_buffer(output, output->back_buffer); @@ -319,10 +311,8 @@ static bool output_commit(struct wlr_output *wlr_output) { static void output_rollback_render(struct wlr_output *wlr_output) { struct wlr_x11_output *output = get_x11_output_from_output(wlr_output); struct wlr_x11_backend *x11 = output->x11; - struct wlr_egl *egl = wlr_gles2_renderer_get_egl(x11->renderer); wlr_renderer_bind_buffer(x11->renderer, NULL); - wlr_egl_unset_current(egl); } static const struct wlr_output_impl output_impl = { |