1 files changed, 50 insertions, 8 deletions

diff --git a/render/egl.c b/render/egl.c
index 96e48c06..644f94ac 100644
--- a/render/egl.c
+++ b/render/egl.c
@@ -3,6 +3,7 @@
 #include <EGL/egl.h>
 #include <EGL/eglext.h>
 #include <stdlib.h>
+#include <drm_fourcc.h>
 #include <wlr/render/egl.h>
 #include <wlr/util/log.h>
 #include "glapi.h"
@@ -120,7 +121,7 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *remote_display,
 
 	if (platform == EGL_PLATFORM_SURFACELESS_MESA) {
 		assert(remote_display == NULL);
-		egl->display = eglGetDisplay(EGL_DEFAULT_DISPLAY);
+		egl->display = eglGetPlatformDisplayEXT(platform, EGL_DEFAULT_DISPLAY, NULL);
 	} else {
 		egl->display = eglGetPlatformDisplayEXT(platform, remote_display, NULL);
 	}
@@ -129,6 +130,8 @@ bool wlr_egl_init(struct wlr_egl *egl, EGLenum platform, void *remote_display,
 		goto error;
 	}
 
+	egl->platform = platform;
+
 	EGLint major, minor;
 	if (eglInitialize(egl->display, &major, &minor) == EGL_FALSE) {
 		wlr_log(WLR_ERROR, "Failed to initialize EGL");
@@ -318,6 +321,11 @@ bool wlr_egl_is_current(struct wlr_egl *egl) {
 
 bool wlr_egl_swap_buffers(struct wlr_egl *egl, EGLSurface surface,
 		pixman_region32_t *damage) {
+	// Never block when swapping buffers on Wayland
+	if (egl->platform == EGL_PLATFORM_WAYLAND_EXT) {
+		eglSwapInterval(egl->display, 0);
+	}
+
 	EGLBoolean ret;
 	if (damage != NULL && (egl->exts.swap_buffers_with_damage_ext ||
 				egl->exts.swap_buffers_with_damage_khr)) {
@@ -382,13 +390,21 @@ EGLImageKHR wlr_egl_create_image_from_wl_drm(struct wlr_egl *egl,
 
 EGLImageKHR wlr_egl_create_image_from_dmabuf(struct wlr_egl *egl,
 		struct wlr_dmabuf_attributes *attributes) {
-	if (!egl->exts.image_base_khr) {
+	if (!egl->exts.image_base_khr || !egl->exts.image_dmabuf_import_ext) {
+		wlr_log(WLR_ERROR, "dmabuf import extension not present");
 		return NULL;
 	}
 
 	bool has_modifier = false;
-	if (attributes->modifier != DRM_FORMAT_MOD_INVALID) {
+
+	// we assume the same way we assumed formats without the import_modifiers
+	// extension that mod_linear is supported. The special mod mod_invalid
+	// is sometimes used to signal modifier unawareness which is what we
+	// have here
+	if (attributes->modifier != DRM_FORMAT_MOD_INVALID &&
+			attributes->modifier != DRM_FORMAT_MOD_LINEAR) {
 		if (!egl->exts.image_dmabuf_import_modifiers_ext) {
+			wlr_log(WLR_ERROR, "dmabuf modifiers extension not present");
 			return NULL;
 		}
 		has_modifier = true;
@@ -460,12 +476,34 @@ EGLImageKHR wlr_egl_create_image_from_dmabuf(struct wlr_egl *egl,
 
 int wlr_egl_get_dmabuf_formats(struct wlr_egl *egl,
 		int **formats) {
-	if (!egl->exts.image_dmabuf_import_ext ||
-			!egl->exts.image_dmabuf_import_modifiers_ext) {
-		wlr_log(WLR_DEBUG, "dmabuf extension not present");
+	if (!egl->exts.image_dmabuf_import_ext) {
+		wlr_log(WLR_DEBUG, "dmabuf import extension not present");
 		return -1;
 	}
 
+	// when we only have the image_dmabuf_import extension we can't query
+	// which formats are supported. These two are on almost always
+	// supported; it's the intended way to just try to create buffers.
+	// Just a guess but better than not supporting dmabufs at all,
+	// given that the modifiers extension isn't supported everywhere.
+	if (!egl->exts.image_dmabuf_import_modifiers_ext) {
+		static const int fallback_formats[] = {
+			DRM_FORMAT_ARGB8888,
+			DRM_FORMAT_XRGB8888,
+		};
+		static unsigned num = sizeof(fallback_formats) /
+			sizeof(fallback_formats[0]);
+
+		*formats = calloc(num, sizeof(int));
+		if (!*formats) {
+			wlr_log_errno(WLR_ERROR, "Allocation failed");
+			return -1;
+		}
+
+		memcpy(*formats, fallback_formats, num * sizeof(**formats));
+		return num;
+	}
+
 	EGLint num;
 	if (!eglQueryDmaBufFormatsEXT(egl->display, 0, NULL, &num)) {
 		wlr_log(WLR_ERROR, "failed to query number of dmabuf formats");
@@ -488,12 +526,16 @@ int wlr_egl_get_dmabuf_formats(struct wlr_egl *egl,
 
 int wlr_egl_get_dmabuf_modifiers(struct wlr_egl *egl,
 		int format, uint64_t **modifiers) {
-	if (!egl->exts.image_dmabuf_import_ext ||
-			!egl->exts.image_dmabuf_import_modifiers_ext) {
+	if (!egl->exts.image_dmabuf_import_ext) {
 		wlr_log(WLR_DEBUG, "dmabuf extension not present");
 		return -1;
 	}
 
+	if(!egl->exts.image_dmabuf_import_modifiers_ext) {
+		*modifiers = NULL;
+		return 0;
+	}
+
 	EGLint num;
 	if (!eglQueryDmaBufModifiersEXT(egl->display, format, 0,
 			NULL, NULL, &num)) {