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>

diff --git a/clients/simple-dmabuf-drm.c b/clients/simple-dmabuf-drm.c
index 0536b52..bd0f922 100644 (file)
--- 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,
                                 &registry_listener, display);

diff --git a/configure.ac b/configure.ac
index 357b647..6f9ad43 100644 (file)
--- 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],