diff options
| -rw-r--r-- | include/wlr/render/interface.h | 2 | ||||
| -rw-r--r-- | render/gles2/renderer.c | 20 | ||||
| -rw-r--r-- | render/wlr_renderer.c | 14 |
3 files changed, 12 insertions, 24 deletions
diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index b3a21b0b..4207bd30 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -44,8 +44,6 @@ struct wlr_renderer_impl { uint32_t src_x, uint32_t src_y, uint32_t dst_x, uint32_t dst_y, void *data); void (*destroy)(struct wlr_renderer *renderer); - bool (*init_wl_display)(struct wlr_renderer *renderer, - struct wl_display *wl_display); int (*get_drm_fd)(struct wlr_renderer *renderer); uint32_t (*get_render_buffer_caps)(struct wlr_renderer *renderer); struct wlr_texture *(*texture_from_buffer)(struct wlr_renderer *renderer, diff --git a/render/gles2/renderer.c b/render/gles2/renderer.c index 6317399f..aa0e38f3 100644 --- a/render/gles2/renderer.c +++ b/render/gles2/renderer.c @@ -12,9 +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/box.h> #include <wlr/util/log.h> #include "render/egl.h" @@ -481,23 +479,6 @@ static bool gles2_read_pixels(struct wlr_renderer *wlr_renderer, return glGetError() == GL_NO_ERROR; } -static bool gles2_init_wl_display(struct wlr_renderer *wlr_renderer, - struct wl_display *wl_display) { - 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, "Cannot get renderer DRM FD, disabling wl_drm"); - } - - if (wlr_linux_dmabuf_v1_create(wl_display, wlr_renderer) == NULL) { - return false; - } - - return true; -} - static int gles2_get_drm_fd(struct wlr_renderer *wlr_renderer) { struct wlr_gles2_renderer *renderer = gles2_get_renderer(wlr_renderer); @@ -570,7 +551,6 @@ static const struct wlr_renderer_impl renderer_impl = { .get_render_formats = gles2_get_render_formats, .preferred_read_format = gles2_preferred_read_format, .read_pixels = gles2_read_pixels, - .init_wl_display = gles2_init_wl_display, .get_drm_fd = gles2_get_drm_fd, .get_render_buffer_caps = gles2_get_render_buffer_caps, .texture_from_buffer = gles2_texture_from_buffer, diff --git a/render/wlr_renderer.c b/render/wlr_renderer.c index cf307bd3..5818cd4a 100644 --- a/render/wlr_renderer.c +++ b/render/wlr_renderer.c @@ -4,6 +4,8 @@ #include <wlr/render/interface.h> #include <wlr/render/pixman.h> #include <wlr/render/wlr_renderer.h> +#include <wlr/types/wlr_drm.h> +#include <wlr/types/wlr_linux_dmabuf_v1.h> #include <wlr/types/wlr_matrix.h> #include <wlr/util/box.h> #include <wlr/util/log.h> @@ -223,8 +225,16 @@ bool wlr_renderer_init_wl_display(struct wlr_renderer *r, } assert(argb8888 && xrgb8888); - if (r->impl->init_wl_display) { - if (!r->impl->init_wl_display(r, wl_display)) { + if (wlr_renderer_get_dmabuf_texture_formats(r) != NULL) { + if (wlr_renderer_get_drm_fd(r) >= 0) { + if (wlr_drm_create(wl_display, r) == NULL) { + return false; + } + } else { + wlr_log(WLR_INFO, "Cannot get renderer DRM FD, disabling wl_drm"); + } + + if (wlr_linux_dmabuf_v1_create(wl_display, r) == NULL) { return false; } } |