diff options
Diffstat (limited to 'render')
| -rw-r--r-- | render/gles2/renderer.c | 23 | ||||
| -rw-r--r-- | render/gles2/texture.c | 15 |
2 files changed, 13 insertions, 25 deletions
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index 914f5b77..17a9cacc 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -25,7 +25,7 @@ struct wlr_gles2_procs gles2_procs = {0}; static const struct wlr_renderer_impl renderer_impl; -static struct wlr_gles2_renderer *gles2_get_renderer( +struct wlr_gles2_renderer *gles2_get_renderer( struct wlr_renderer *wlr_renderer) { assert(wlr_renderer->impl == &renderer_impl); return (struct wlr_gles2_renderer *)wlr_renderer; @@ -442,27 +442,6 @@ restore_context_out: return r; } -static struct wlr_texture *gles2_texture_from_pixels( - struct wlr_renderer *wlr_renderer, enum wl_shm_format wl_fmt, - uint32_t stride, uint32_t width, uint32_t height, const void *data) { - struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); - return wlr_gles2_texture_from_pixels(renderer->egl, wl_fmt, stride, width, - height, data); -} - -static struct wlr_texture *gles2_texture_from_wl_drm( - struct wlr_renderer *wlr_renderer, struct wl_resource *data) { - struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); - return wlr_gles2_texture_from_wl_drm(renderer->egl, data); -} - -static struct wlr_texture *gles2_texture_from_dmabuf( - struct wlr_renderer *wlr_renderer, - struct wlr_dmabuf_attributes *attribs) { - struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); - return wlr_gles2_texture_from_dmabuf(renderer->egl, attribs); -} - static bool gles2_init_wl_display(struct wlr_renderer *wlr_renderer, struct wl_display *wl_display) { struct wlr_gles2_renderer *renderer = diff --git a/render/gles2/texture.c b/render/gles2/texture.c index 0187a462..d92eeac3 100644 --- a/render/gles2/texture.c +++ b/render/gles2/texture.c @@ -134,9 +134,12 @@ static const struct wlr_texture_impl texture_impl = { .destroy = gles2_texture_destroy, }; -struct wlr_texture *wlr_gles2_texture_from_pixels(struct wlr_egl *egl, +struct wlr_texture *gles2_texture_from_pixels(struct wlr_renderer *wlr_renderer, enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width, uint32_t height, const void *data) { + struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); + struct wlr_egl *egl = renderer->egl; + wlr_egl_make_current(egl, EGL_NO_SURFACE, NULL); const struct wlr_gles2_pixel_format *fmt = get_gles2_format_from_wl(wl_fmt); @@ -175,8 +178,11 @@ struct wlr_texture *wlr_gles2_texture_from_pixels(struct wlr_egl *egl, return &texture->wlr_texture; } -struct wlr_texture *wlr_gles2_texture_from_wl_drm(struct wlr_egl *egl, +struct wlr_texture *gles2_texture_from_wl_drm(struct wlr_renderer *wlr_renderer, struct wl_resource *resource) { + struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); + struct wlr_egl *egl = renderer->egl; + wlr_egl_make_current(egl, EGL_NO_SURFACE, NULL); if (!gles2_procs.glEGLImageTargetTexture2DOES) { @@ -238,8 +244,11 @@ struct wlr_texture *wlr_gles2_texture_from_wl_drm(struct wlr_egl *egl, return &texture->wlr_texture; } -struct wlr_texture *wlr_gles2_texture_from_dmabuf(struct wlr_egl *egl, +struct wlr_texture *gles2_texture_from_dmabuf(struct wlr_renderer *wlr_renderer, struct wlr_dmabuf_attributes *attribs) { + struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); + struct wlr_egl *egl = renderer->egl; + wlr_egl_make_current(egl, EGL_NO_SURFACE, NULL); if (!gles2_procs.glEGLImageTargetTexture2DOES) { |