diff options
Diffstat (limited to 'render/gles2/renderer.c')
| -rw-r--r-- | render/gles2/renderer.c | 42 |
1 files changed, 4 insertions, 38 deletions
diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index 2e1a1488..a31896bf 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -12,6 +12,7 @@ #include <wlr/render/egl.h> #include <wlr/render/interface.h> #include <wlr/render/wlr_renderer.h> +#include <wlr/types/wlr_drm.h> #include <wlr/types/wlr_matrix.h> #include <wlr/types/wlr_linux_dmabuf_v1.h> #include <wlr/util/log.h> @@ -368,34 +369,6 @@ static const uint32_t *gles2_get_shm_texture_formats( return get_gles2_shm_formats(len); } -static bool gles2_resource_is_wl_drm_buffer(struct wlr_renderer *wlr_renderer, - struct wl_resource *resource) { - struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); - - if (!renderer->egl->exts.bind_wayland_display_wl) { - return false; - } - - EGLint fmt; - return renderer->egl->procs.eglQueryWaylandBufferWL(renderer->egl->display, - resource, EGL_TEXTURE_FORMAT, &fmt); -} - -static void gles2_wl_drm_buffer_get_size(struct wlr_renderer *wlr_renderer, - struct wl_resource *buffer, int *width, int *height) { - struct wlr_gles2_renderer *renderer = - gles2_get_renderer(wlr_renderer); - - if (!renderer->egl->exts.bind_wayland_display_wl) { - return; - } - - renderer->egl->procs.eglQueryWaylandBufferWL(renderer->egl->display, - buffer, EGL_WIDTH, width); - renderer->egl->procs.eglQueryWaylandBufferWL(renderer->egl->display, - buffer, EGL_HEIGHT, height); -} - static const struct wlr_drm_format_set *gles2_get_dmabuf_texture_formats( struct wlr_renderer *wlr_renderer) { struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); @@ -498,16 +471,12 @@ static bool gles2_read_pixels(struct wlr_renderer *wlr_renderer, static bool gles2_init_wl_display(struct wlr_renderer *wlr_renderer, struct wl_display *wl_display) { - struct wlr_gles2_renderer *renderer = - gles2_get_renderer(wlr_renderer); - - if (renderer->egl->exts.bind_wayland_display_wl) { - if (!wlr_egl_bind_display(renderer->egl, wl_display)) { - wlr_log(WLR_ERROR, "Failed to bind wl_display to EGL"); + if (wlr_renderer_get_drm_fd(wlr_renderer) >= 0) { + if (wlr_drm_create(wl_display, wlr_renderer) == NULL) { return false; } } else { - wlr_log(WLR_INFO, "EGL_WL_bind_wayland_display is not supported"); + wlr_log(WLR_INFO, "Cannot get renderer DRM FD, disabling wl_drm"); } if (wlr_linux_dmabuf_v1_create(wl_display, wlr_renderer) == NULL) { @@ -585,13 +554,10 @@ static const struct wlr_renderer_impl renderer_impl = { .render_subtexture_with_matrix = gles2_render_subtexture_with_matrix, .render_quad_with_matrix = gles2_render_quad_with_matrix, .get_shm_texture_formats = gles2_get_shm_texture_formats, - .resource_is_wl_drm_buffer = gles2_resource_is_wl_drm_buffer, - .wl_drm_buffer_get_size = gles2_wl_drm_buffer_get_size, .get_dmabuf_texture_formats = gles2_get_dmabuf_texture_formats, .get_render_formats = gles2_get_render_formats, .preferred_read_format = gles2_preferred_read_format, .read_pixels = gles2_read_pixels, - .texture_from_wl_drm = gles2_texture_from_wl_drm, .init_wl_display = gles2_init_wl_display, .get_drm_fd = gles2_get_drm_fd, .get_render_buffer_caps = gles2_get_render_buffer_caps, |