diff options
| author | Emilio Pozuelo Monfort <pochu27@gmail.com> | 2018-07-12 13:46:24 +0200 |
|---|---|---|
| committer | Daniel Stone <daniels@collabora.com> | 2018-07-13 16:13:32 +0100 |
| commit | cce820dcafb4f04e6c53904c3a643ef534b31915 (patch) | |
| tree | 4e81a14b5de34c0fd61bfe339302396abff4e8a3 | |
| parent | 1166f8e9a13f151a1dcab3cae081013324f0538e (diff) | |
| download | weston-cce820dcafb4f04e6c53904c3a643ef534b31915.tar.gz weston-cce820dcafb4f04e6c53904c3a643ef534b31915.tar.bz2 weston-cce820dcafb4f04e6c53904c3a643ef534b31915.zip | |
simple-dmabuf-drm: fix build with --disable-egl
Just rely on getting the supported formats through the dmabuf
extension.
Signed-off-by: Emilio Pozuelo Monfort <emilio.pozuelo@collabora.co.uk>
Reviewed-by: Daniel Stone <daniels@collabora.com>
| -rw-r--r-- | clients/simple-dmabuf-drm.c | 11 | ||||
| -rw-r--r-- | configure.ac | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/clients/simple-dmabuf-drm.c b/clients/simple-dmabuf-drm.c index 0536b522..bd0f9224 100644 --- a/clients/simple-dmabuf-drm.c +++ b/clients/simple-dmabuf-drm.c @@ -57,7 +57,6 @@ #include <wayland-client.h> #include "shared/zalloc.h" -#include "shared/platform.h" #include "xdg-shell-unstable-v6-client-protocol.h" #include "fullscreen-shell-unstable-v1-client-protocol.h" #include "linux-dmabuf-unstable-v1-client-protocol.h" @@ -843,7 +842,6 @@ static struct display * create_display(int opts, int format) { struct display *display; - const char *extensions; display = malloc(sizeof *display); if (display == NULL) { @@ -855,15 +853,6 @@ create_display(int opts, int format) display->req_dmabuf_immediate = opts & OPT_IMMEDIATE; - /* - * hard code format if the platform egl doesn't support format - * querying / advertising. - */ - extensions = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS); - if (extensions && !weston_check_egl_extension(extensions, - "EGL_EXT_image_dma_buf_import_modifiers")) - display->xrgb8888_format_found = 1; - display->registry = wl_display_get_registry(display->display); wl_registry_add_listener(display->registry, ®istry_listener, display); diff --git a/configure.ac b/configure.ac index 357b6471..6f9ad434 100644 --- a/configure.ac +++ b/configure.ac @@ -400,7 +400,7 @@ AC_ARG_ENABLE(simple-dmabuf-drm-client, [do not build the simple dmabuf drm client]),, enable_simple_dmabuf_drm_client="auto") if ! test "x$enable_simple_dmabuf_drm_client" = "xno"; then - PKG_CHECK_MODULES(SIMPLE_DMABUF_DRM_CLIENT, [wayland-client libdrm egl], [have_simple_dmabuf_libs=yes], + PKG_CHECK_MODULES(SIMPLE_DMABUF_DRM_CLIENT, [wayland-client libdrm], [have_simple_dmabuf_libs=yes], [have_simple_dmabuf_libs=no]) PKG_CHECK_MODULES(LIBDRM_PLATFORM_FREEDRENO, [libdrm_freedreno], |