[PATCH weston 2/4 v3] simple-dmabuf-drm: fix build with --disable-egl
Emilio Pozuelo Monfort
pochu27 at gmail.com
Wed Jul 11 11:52:43 UTC 2018
Just rely on getting the supported formats through the dmabuf
extension.
Signed-off-by: Emilio Pozuelo Monfort <emilio.pozuelo at collabora.co.uk>
---
v3: this now drops the dependency on libEGL
clients/simple-dmabuf-drm.c | 11 -----------
configure.ac | 2 +-
2 files changed, 1 insertion(+), 12 deletions(-)
diff --git a/clients/simple-dmabuf-drm.c b/clients/simple-dmabuf-drm.c
index 1c8b6f36..4f1da878 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"
@@ -841,7 +840,6 @@ static struct display *
create_display(int opts, int format)
{
struct display *display;
- const char *extensions;
display = malloc(sizeof *display);
if (display == NULL) {
@@ -853,15 +851,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 39168e20..1ecba972 100644
--- a/configure.ac
+++ b/configure.ac
@@ -391,7 +391,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],
--
2.18.0
More information about the wayland-devel
mailing list