6 files changed, 1566 insertions, 21 deletions

diff --git a/render/egl.c b/render/egl.c
new file mode 100644
index 0000000..162634b
--- /dev/null
+++ b/render/egl.c
@@ -0,0 +1,1021 @@
+#define _POSIX_C_SOURCE 200809L
+#include <assert.h>
+#include <drm_fourcc.h>
+#include <fcntl.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <gbm.h>
+#include <wlr/render/egl.h>
+#include <wlr/util/log.h>
+#include <wlr/util/region.h>
+#include <xf86drm.h>
+#include "render/egl.h"
+#include "util/env.h"
+
+static enum wlr_log_importance egl_log_importance_to_wlr(EGLint type) {
+	switch (type) {
+	case EGL_DEBUG_MSG_CRITICAL_KHR: return WLR_ERROR;
+	case EGL_DEBUG_MSG_ERROR_KHR:    return WLR_ERROR;
+	case EGL_DEBUG_MSG_WARN_KHR:     return WLR_ERROR;
+	case EGL_DEBUG_MSG_INFO_KHR:     return WLR_INFO;
+	default:                         return WLR_INFO;
+	}
+}
+
+static const char *egl_error_str(EGLint error) {
+	switch (error) {
+	case EGL_SUCCESS:
+		return "EGL_SUCCESS";
+	case EGL_NOT_INITIALIZED:
+		return "EGL_NOT_INITIALIZED";
+	case EGL_BAD_ACCESS:
+		return "EGL_BAD_ACCESS";
+	case EGL_BAD_ALLOC:
+		return "EGL_BAD_ALLOC";
+	case EGL_BAD_ATTRIBUTE:
+		return "EGL_BAD_ATTRIBUTE";
+	case EGL_BAD_CONTEXT:
+		return "EGL_BAD_CONTEXT";
+	case EGL_BAD_CONFIG:
+		return "EGL_BAD_CONFIG";
+	case EGL_BAD_CURRENT_SURFACE:
+		return "EGL_BAD_CURRENT_SURFACE";
+	case EGL_BAD_DISPLAY:
+		return "EGL_BAD_DISPLAY";
+	case EGL_BAD_DEVICE_EXT:
+		return "EGL_BAD_DEVICE_EXT";
+	case EGL_BAD_SURFACE:
+		return "EGL_BAD_SURFACE";
+	case EGL_BAD_MATCH:
+		return "EGL_BAD_MATCH";
+	case EGL_BAD_PARAMETER:
+		return "EGL_BAD_PARAMETER";
+	case EGL_BAD_NATIVE_PIXMAP:
+		return "EGL_BAD_NATIVE_PIXMAP";
+	case EGL_BAD_NATIVE_WINDOW:
+		return "EGL_BAD_NATIVE_WINDOW";
+	case EGL_CONTEXT_LOST:
+		return "EGL_CONTEXT_LOST";
+	}
+	return "unknown error";
+}
+
+static void egl_log(EGLenum error, const char *command, EGLint msg_type,
+		EGLLabelKHR thread, EGLLabelKHR obj, const char *msg) {
+	_wlr_log(egl_log_importance_to_wlr(msg_type),
+		"[EGL] command: %s, error: %s (0x%x), message: \"%s\"",
+		command, egl_error_str(error), error, msg);
+}
+
+static bool check_egl_ext(const char *exts, const char *ext) {
+	size_t extlen = strlen(ext);
+	const char *end = exts + strlen(exts);
+
+	while (exts < end) {
+		if (*exts == ' ') {
+			exts++;
+			continue;
+		}
+		size_t n = strcspn(exts, " ");
+		if (n == extlen && strncmp(ext, exts, n) == 0) {
+			return true;
+		}
+		exts += n;
+	}
+	return false;
+}
+
+static void load_egl_proc(void *proc_ptr, const char *name) {
+	void *proc = (void *)eglGetProcAddress(name);
+	if (proc == NULL) {
+		wlr_log(WLR_ERROR, "eglGetProcAddress(%s) failed", name);
+		abort();
+	}
+	*(void **)proc_ptr = proc;
+}
+
+static int get_egl_dmabuf_formats(struct wlr_egl *egl, EGLint **formats);
+static int get_egl_dmabuf_modifiers(struct wlr_egl *egl, EGLint format,
+	uint64_t **modifiers, EGLBoolean **external_only);
+
+static void log_modifier(uint64_t modifier, bool external_only) {
+	char *mod_name = drmGetFormatModifierName(modifier);
+	wlr_log(WLR_DEBUG, "    %s (0x%016"PRIX64"): ✓ texture  %s render",
+		mod_name ? mod_name : "<unknown>", modifier, external_only ? "✗" : "✓");
+	free(mod_name);
+}
+
+static void init_dmabuf_formats(struct wlr_egl *egl) {
+	bool no_modifiers = env_parse_bool("WLR_EGL_NO_MODIFIERS");
+	if (no_modifiers) {
+		wlr_log(WLR_INFO, "WLR_EGL_NO_MODIFIERS set, disabling modifiers for EGL");
+	}
+
+	EGLint *formats;
+	int formats_len = get_egl_dmabuf_formats(egl, &formats);
+	if (formats_len < 0) {
+		return;
+	}
+
+	wlr_log(WLR_DEBUG, "Supported DMA-BUF formats:");
+
+	bool has_modifiers = false;
+	for (int i = 0; i < formats_len; i++) {
+		EGLint fmt = formats[i];
+
+		uint64_t *modifiers = NULL;
+		EGLBoolean *external_only = NULL;
+		int modifiers_len = 0;
+		if (!no_modifiers) {
+			modifiers_len = get_egl_dmabuf_modifiers(egl, fmt, &modifiers, &external_only);
+		}
+		if (modifiers_len < 0) {
+			continue;
+		}
+
+		has_modifiers = has_modifiers || modifiers_len > 0;
+
+		bool all_external_only = true;
+		for (int j = 0; j < modifiers_len; j++) {
+			wlr_drm_format_set_add(&egl->dmabuf_texture_formats, fmt,
+				modifiers[j]);
+			if (!external_only[j]) {
+				wlr_drm_format_set_add(&egl->dmabuf_render_formats, fmt,
+					modifiers[j]);
+				all_external_only = false;
+			}
+		}
+
+		// EGL always supports implicit modifiers. If at least one modifier supports rendering,
+		// assume the implicit modifier supports rendering too.
+		wlr_drm_format_set_add(&egl->dmabuf_texture_formats, fmt,
+			DRM_FORMAT_MOD_INVALID);
+		if (modifiers_len == 0 || !all_external_only) {
+			wlr_drm_format_set_add(&egl->dmabuf_render_formats, fmt,
+				DRM_FORMAT_MOD_INVALID);
+		}
+
+		if (modifiers_len == 0) {
+			// Asume the linear layout is supported if the driver doesn't
+			// explicitly say otherwise
+			wlr_drm_format_set_add(&egl->dmabuf_texture_formats, fmt,
+				DRM_FORMAT_MOD_LINEAR);
+			wlr_drm_format_set_add(&egl->dmabuf_render_formats, fmt,
+				DRM_FORMAT_MOD_LINEAR);
+		}
+
+		if (wlr_log_get_verbosity() >= WLR_DEBUG) {
+			char *fmt_name = drmGetFormatName(fmt);
+			wlr_log(WLR_DEBUG, "  %s (0x%08"PRIX32")",
+				fmt_name ? fmt_name : "<unknown>", fmt);
+			free(fmt_name);
+
+			log_modifier(DRM_FORMAT_MOD_INVALID, false);
+			if (modifiers_len == 0) {
+				log_modifier(DRM_FORMAT_MOD_LINEAR, false);
+			}
+			for (int j = 0; j < modifiers_len; j++) {
+				log_modifier(modifiers[j], external_only[j]);
+			}
+		}
+
+		free(modifiers);
+		free(external_only);
+	}
+	free(formats);
+
+	egl->has_modifiers = has_modifiers;
+	if (!no_modifiers) {
+		wlr_log(WLR_DEBUG, "EGL DMA-BUF format modifiers %s",
+			has_modifiers ? "supported" : "unsupported");
+	}
+}
+
+static struct wlr_egl *egl_create(void) {
+	const char *client_exts_str = eglQueryString(EGL_NO_DISPLAY, EGL_EXTENSIONS);
+	if (client_exts_str == NULL) {
+		if (eglGetError() == EGL_BAD_DISPLAY) {
+			wlr_log(WLR_ERROR, "EGL_EXT_client_extensions not supported");
+		} else {
+			wlr_log(WLR_ERROR, "Failed to query EGL client extensions");
+		}
+		return NULL;
+	}
+
+	wlr_log(WLR_INFO, "Supported EGL client extensions: %s", client_exts_str);
+
+	if (!check_egl_ext(client_exts_str, "EGL_EXT_platform_base")) {
+		wlr_log(WLR_ERROR, "EGL_EXT_platform_base not supported");
+		return NULL;
+	}
+
+	struct wlr_egl *egl = calloc(1, sizeof(*egl));
+	if (egl == NULL) {
+		wlr_log_errno(WLR_ERROR, "Allocation failed");
+		return NULL;
+	}
+
+	load_egl_proc(&egl->procs.eglGetPlatformDisplayEXT,
+		"eglGetPlatformDisplayEXT");
+
+	egl->exts.KHR_platform_gbm = check_egl_ext(client_exts_str,
+			"EGL_KHR_platform_gbm");
+	egl->exts.EXT_platform_device = check_egl_ext(client_exts_str,
+			"EGL_EXT_platform_device");
+	egl->exts.KHR_display_reference = check_egl_ext(client_exts_str,
+			"EGL_KHR_display_reference");
+
+	if (check_egl_ext(client_exts_str, "EGL_EXT_device_base") || check_egl_ext(client_exts_str, "EGL_EXT_device_enumeration")) {
+		load_egl_proc(&egl->procs.eglQueryDevicesEXT, "eglQueryDevicesEXT");
+	}
+
+	if (check_egl_ext(client_exts_str, "EGL_EXT_device_base") || check_egl_ext(client_exts_str, "EGL_EXT_device_query")) {
+		egl->exts.EXT_device_query = true;
+		load_egl_proc(&egl->procs.eglQueryDeviceStringEXT,
+			"eglQueryDeviceStringEXT");
+		load_egl_proc(&egl->procs.eglQueryDisplayAttribEXT,
+			"eglQueryDisplayAttribEXT");
+	}
+
+	if (check_egl_ext(client_exts_str, "EGL_KHR_debug")) {
+		load_egl_proc(&egl->procs.eglDebugMessageControlKHR,
+			"eglDebugMessageControlKHR");
+
+		static const EGLAttrib debug_attribs[] = {
+			EGL_DEBUG_MSG_CRITICAL_KHR, EGL_TRUE,
+			EGL_DEBUG_MSG_ERROR_KHR, EGL_TRUE,
+			EGL_DEBUG_MSG_WARN_KHR, EGL_TRUE,
+			EGL_DEBUG_MSG_INFO_KHR, EGL_TRUE,
+			EGL_NONE,
+		};
+		egl->procs.eglDebugMessageControlKHR(egl_log, debug_attribs);
+	}
+
+	if (eglBindAPI(EGL_OPENGL_ES_API) == EGL_FALSE) {
+		wlr_log(WLR_ERROR, "Failed to bind to the OpenGL ES API");
+		free(egl);
+		return NULL;
+	}
+
+	return egl;
+}
+
+static bool egl_init_display(struct wlr_egl *egl, EGLDisplay display) {
+	egl->display = display;
+
+	EGLint major, minor;
+	if (eglInitialize(egl->display, &major, &minor) == EGL_FALSE) {
+		wlr_log(WLR_ERROR, "Failed to initialize EGL");
+		return false;
+	}
+
+	const char *display_exts_str = eglQueryString(egl->display, EGL_EXTENSIONS);
+	if (display_exts_str == NULL) {
+		wlr_log(WLR_ERROR, "Failed to query EGL display extensions");
+		return false;
+	}
+
+	if (check_egl_ext(display_exts_str, "EGL_KHR_image_base")) {
+		egl->exts.KHR_image_base = true;
+		load_egl_proc(&egl->procs.eglCreateImageKHR, "eglCreateImageKHR");
+		load_egl_proc(&egl->procs.eglDestroyImageKHR, "eglDestroyImageKHR");
+	}
+
+	egl->exts.EXT_image_dma_buf_import =
+		check_egl_ext(display_exts_str, "EGL_EXT_image_dma_buf_import");
+	if (check_egl_ext(display_exts_str,
+			"EGL_EXT_image_dma_buf_import_modifiers")) {
+		egl->exts.EXT_image_dma_buf_import_modifiers = true;
+		load_egl_proc(&egl->procs.eglQueryDmaBufFormatsEXT,
+			"eglQueryDmaBufFormatsEXT");
+		load_egl_proc(&egl->procs.eglQueryDmaBufModifiersEXT,
+			"eglQueryDmaBufModifiersEXT");
+	}
+
+	egl->exts.EXT_create_context_robustness =
+		check_egl_ext(display_exts_str, "EGL_EXT_create_context_robustness");
+
+	const char *device_exts_str = NULL, *driver_name = NULL;
+	if (egl->exts.EXT_device_query) {
+		EGLAttrib device_attrib;
+		if (!egl->procs.eglQueryDisplayAttribEXT(egl->display,
+				EGL_DEVICE_EXT, &device_attrib)) {
+			wlr_log(WLR_ERROR, "eglQueryDisplayAttribEXT(EGL_DEVICE_EXT) failed");
+			return false;
+		}
+		egl->device = (EGLDeviceEXT)device_attrib;
+
+		device_exts_str =
+			egl->procs.eglQueryDeviceStringEXT(egl->device, EGL_EXTENSIONS);
+		if (device_exts_str == NULL) {
+			wlr_log(WLR_ERROR, "eglQueryDeviceStringEXT(EGL_EXTENSIONS) failed");
+			return false;
+		}
+
+		if (check_egl_ext(device_exts_str, "EGL_MESA_device_software")) {
+			if (env_parse_bool("WLR_RENDERER_ALLOW_SOFTWARE")) {
+				wlr_log(WLR_INFO, "Using software rendering");
+			} else {
+				wlr_log(WLR_ERROR, "Software rendering detected, please use "
+					"the WLR_RENDERER_ALLOW_SOFTWARE environment variable "
+					"to proceed");
+				return false;
+			}
+		}
+
+#ifdef EGL_DRIVER_NAME_EXT
+		if (check_egl_ext(device_exts_str, "EGL_EXT_device_persistent_id")) {
+			driver_name = egl->procs.eglQueryDeviceStringEXT(egl->device,
+				EGL_DRIVER_NAME_EXT);
+		}
+#endif
+
+		egl->exts.EXT_device_drm =
+			check_egl_ext(device_exts_str, "EGL_EXT_device_drm");
+		egl->exts.EXT_device_drm_render_node =
+			check_egl_ext(device_exts_str, "EGL_EXT_device_drm_render_node");
+	}
+
+	if (!check_egl_ext(display_exts_str, "EGL_KHR_no_config_context") &&
+			!check_egl_ext(display_exts_str, "EGL_MESA_configless_context")) {
+		wlr_log(WLR_ERROR, "EGL_KHR_no_config_context or "
+			"EGL_MESA_configless_context not supported");
+		return false;
+	}
+
+	if (!check_egl_ext(display_exts_str, "EGL_KHR_surfaceless_context")) {
+		wlr_log(WLR_ERROR, "EGL_KHR_surfaceless_context not supported");
+		return false;
+	}
+
+	egl->exts.IMG_context_priority =
+		check_egl_ext(display_exts_str, "EGL_IMG_context_priority");
+
+	wlr_log(WLR_INFO, "Using EGL %d.%d", (int)major, (int)minor);
+	wlr_log(WLR_INFO, "Supported EGL display extensions: %s", display_exts_str);
+	if (device_exts_str != NULL) {
+		wlr_log(WLR_INFO, "Supported EGL device extensions: %s", device_exts_str);
+	}
+	wlr_log(WLR_INFO, "EGL vendor: %s", eglQueryString(egl->display, EGL_VENDOR));
+	if (driver_name != NULL) {
+		wlr_log(WLR_INFO, "EGL driver name: %s", driver_name);
+	}
+
+	init_dmabuf_formats(egl);
+
+	return true;
+}
+
+static bool egl_init(struct wlr_egl *egl, EGLenum platform,
+		void *remote_display) {
+	EGLint display_attribs[3] = {0};
+	size_t display_attribs_len = 0;
+
+	if (egl->exts.KHR_display_reference) {
+		display_attribs[display_attribs_len++] = EGL_TRACK_REFERENCES_KHR;
+		display_attribs[display_attribs_len++] = EGL_TRUE;
+	}
+
+	display_attribs[display_attribs_len++] = EGL_NONE;
+	assert(display_attribs_len < sizeof(display_attribs) / sizeof(display_attribs[0]));
+
+	EGLDisplay display = egl->procs.eglGetPlatformDisplayEXT(platform,
+		remote_display, display_attribs);
+	if (display == EGL_NO_DISPLAY) {
+		wlr_log(WLR_ERROR, "Failed to create EGL display");
+		return false;
+	}
+
+	if (!egl_init_display(egl, display)) {
+		if (egl->exts.KHR_display_reference) {
+			eglTerminate(display);
+		}
+		return false;
+	}
+
+	size_t atti = 0;
+	EGLint attribs[7];
+	attribs[atti++] = EGL_CONTEXT_CLIENT_VERSION;
+	attribs[atti++] = 2;
+
+	// Request a high priority context if possible
+	// TODO: only do this if we're running as the DRM master
+	bool request_high_priority = egl->exts.IMG_context_priority;
+
+	// Try to reschedule all of our rendering to be completed first. If it
+	// fails, it will fallback to the default priority (MEDIUM).
+	if (request_high_priority) {
+		attribs[atti++] = EGL_CONTEXT_PRIORITY_LEVEL_IMG;
+		attribs[atti++] = EGL_CONTEXT_PRIORITY_HIGH_IMG;
+	}
+
+	if (egl->exts.EXT_create_context_robustness) {
+		attribs[atti++] = EGL_CONTEXT_OPENGL_RESET_NOTIFICATION_STRATEGY_EXT;
+		attribs[atti++] = EGL_LOSE_CONTEXT_ON_RESET_EXT;
+	}
+
+	attribs[atti++] = EGL_NONE;
+	assert(atti <= sizeof(attribs)/sizeof(attribs[0]));
+
+	egl->context = eglCreateContext(egl->display, EGL_NO_CONFIG_KHR,
+		EGL_NO_CONTEXT, attribs);
+	if (egl->context == EGL_NO_CONTEXT) {
+		wlr_log(WLR_ERROR, "Failed to create EGL context");
+		return false;
+	}
+
+	if (request_high_priority) {
+		EGLint priority = EGL_CONTEXT_PRIORITY_MEDIUM_IMG;
+		eglQueryContext(egl->display, egl->context,
+			EGL_CONTEXT_PRIORITY_LEVEL_IMG, &priority);
+		if (priority != EGL_CONTEXT_PRIORITY_HIGH_IMG) {
+			wlr_log(WLR_INFO, "Failed to obtain a high priority context");
+		} else {
+			wlr_log(WLR_DEBUG, "Obtained high priority context");
+		}
+	}
+
+	return true;
+}
+
+static bool device_has_name(const drmDevice *device, const char *name);
+
+static EGLDeviceEXT get_egl_device_from_drm_fd(struct wlr_egl *egl,
+		int drm_fd) {
+	if (egl->procs.eglQueryDevicesEXT == NULL) {
+		wlr_log(WLR_DEBUG, "EGL_EXT_device_enumeration not supported");
+		return EGL_NO_DEVICE_EXT;
+	} else if (!egl->exts.EXT_device_query) {
+		wlr_log(WLR_DEBUG, "EGL_EXT_device_query not supported");
+		return EGL_NO_DEVICE_EXT;
+	}
+
+	EGLint nb_devices = 0;
+	if (!egl->procs.eglQueryDevicesEXT(0, NULL, &nb_devices)) {
+		wlr_log(WLR_ERROR, "Failed to query EGL devices");
+		return EGL_NO_DEVICE_EXT;
+	}
+
+	EGLDeviceEXT *devices = calloc(nb_devices, sizeof(*devices));
+	if (devices == NULL) {
+		wlr_log_errno(WLR_ERROR, "Failed to allocate EGL device list");
+		return EGL_NO_DEVICE_EXT;
+	}
+
+	if (!egl->procs.eglQueryDevicesEXT(nb_devices, devices, &nb_devices)) {
+		wlr_log(WLR_ERROR, "Failed to query EGL devices");
+		return EGL_NO_DEVICE_EXT;
+	}
+
+	drmDevice *device = NULL;
+	int ret = drmGetDevice(drm_fd, &device);
+	if (ret < 0) {
+		wlr_log(WLR_ERROR, "Failed to get DRM device: %s", strerror(-ret));
+		return EGL_NO_DEVICE_EXT;
+	}
+
+	EGLDeviceEXT egl_device = NULL;
+	for (int i = 0; i < nb_devices; i++) {
+		const char *egl_device_name = egl->procs.eglQueryDeviceStringEXT(
+				devices[i], EGL_DRM_DEVICE_FILE_EXT);
+		if (egl_device_name == NULL) {
+			continue;
+		}
+
+		if (device_has_name(device, egl_device_name)) {
+			wlr_log(WLR_DEBUG, "Using EGL device %s", egl_device_name);
+			egl_device = devices[i];
+			break;
+		}
+	}
+
+	drmFreeDevice(&device);
+	free(devices);
+
+	return egl_device;
+}
+
+static int open_render_node(int drm_fd) {
+	char *render_name = drmGetRenderDeviceNameFromFd(drm_fd);
+	if (render_name == NULL) {
+		// This can happen on split render/display platforms, fallback to
+		// primary node
+		render_name = drmGetPrimaryDeviceNameFromFd(drm_fd);
+		if (render_name == NULL) {
+			wlr_log_errno(WLR_ERROR, "drmGetPrimaryDeviceNameFromFd failed");
+			return -1;
+		}
+		wlr_log(WLR_DEBUG, "DRM device '%s' has no render node, "
+			"falling back to primary node", render_name);
+	}
+
+	int render_fd = open(render_name, O_RDWR | O_CLOEXEC);
+	if (render_fd < 0) {
+		wlr_log_errno(WLR_ERROR, "Failed to open DRM node '%s'", render_name);
+	}
+	free(render_name);
+	return render_fd;
+}
+
+struct wlr_egl *wlr_egl_create_with_drm_fd(int drm_fd) {
+	struct wlr_egl *egl = egl_create();
+	if (egl == NULL) {
+		wlr_log(WLR_ERROR, "Failed to create EGL context");
+		return NULL;
+	}
+
+	if (egl->exts.EXT_platform_device) {
+		/*
+		 * Search for the EGL device matching the DRM fd using the
+		 * EXT_device_enumeration extension.
+		 */
+		EGLDeviceEXT egl_device = get_egl_device_from_drm_fd(egl, drm_fd);
+		if (egl_device != EGL_NO_DEVICE_EXT) {
+			if (egl_init(egl, EGL_PLATFORM_DEVICE_EXT, egl_device)) {
+				wlr_log(WLR_DEBUG, "Using EGL_PLATFORM_DEVICE_EXT");
+				return egl;
+			}
+			goto error;
+		}
+		/* Falls back on GBM in case the device was not found */
+	} else {
+		wlr_log(WLR_DEBUG, "EXT_platform_device not supported");
+	}
+
+	if (egl->exts.KHR_platform_gbm) {
+		int gbm_fd = open_render_node(drm_fd);
+		if (gbm_fd < 0) {
+			wlr_log(WLR_ERROR, "Failed to open DRM render node");
+			goto error;
+		}
+
+		egl->gbm_device = gbm_create_device(gbm_fd);
+		if (!egl->gbm_device) {
+			close(gbm_fd);
+			wlr_log(WLR_ERROR, "Failed to create GBM device");
+			goto error;
+		}
+
+		if (egl_init(egl, EGL_PLATFORM_GBM_KHR, egl->gbm_device)) {
+			wlr_log(WLR_DEBUG, "Using EGL_PLATFORM_GBM_KHR");
+			return egl;
+		}
+
+		gbm_device_destroy(egl->gbm_device);
+		close(gbm_fd);
+	} else {
+		wlr_log(WLR_DEBUG, "KHR_platform_gbm not supported");
+	}
+
+error:
+	wlr_log(WLR_ERROR, "Failed to initialize EGL context");
+	free(egl);
+	eglReleaseThread();
+	return NULL;
+}
+
+struct wlr_egl *wlr_egl_create_with_context(EGLDisplay display,
+		EGLContext context) {
+	EGLint client_type;
+	if (!eglQueryContext(display, context, EGL_CONTEXT_CLIENT_TYPE, &client_type) ||
+			client_type != EGL_OPENGL_ES_API) {
+		wlr_log(WLR_ERROR, "Unsupported EGL context client type (need OpenGL ES)");
+		return NULL;
+	}
+
+	EGLint client_version;
+	if (!eglQueryContext(display, context, EGL_CONTEXT_CLIENT_VERSION, &client_version) ||
+			client_version < 2) {
+		wlr_log(WLR_ERROR, "Unsupported EGL context client version (need OpenGL ES >= 2)");
+		return NULL;
+	}
+
+	struct wlr_egl *egl = egl_create();
+	if (egl == NULL) {
+		return NULL;
+	}
+
+	if (!egl_init_display(egl, display)) {
+		free(egl);
+		return NULL;
+	}
+
+	egl->context = context;
+
+	return egl;
+}
+
+void wlr_egl_destroy(struct wlr_egl *egl) {
+	if (egl == NULL) {
+		return;
+	}
+
+	wlr_drm_format_set_finish(&egl->dmabuf_render_formats);
+	wlr_drm_format_set_finish(&egl->dmabuf_texture_formats);
+
+	eglMakeCurrent(egl->display, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT);
+	eglDestroyContext(egl->display, egl->context);
+
+	if (egl->exts.KHR_display_reference) {
+		eglTerminate(egl->display);
+	}
+
+	eglReleaseThread();
+
+	if (egl->gbm_device) {
+		int gbm_fd = gbm_device_get_fd(egl->gbm_device);
+		gbm_device_destroy(egl->gbm_device);
+		close(gbm_fd);
+	}
+
+	free(egl);
+}
+
+EGLDisplay wlr_egl_get_display(struct wlr_egl *egl) {
+	return egl->display;
+}
+
+EGLContext wlr_egl_get_context(struct wlr_egl *egl) {
+	return egl->context;
+}
+
+bool wlr_egl_destroy_image(struct wlr_egl *egl, EGLImage image) {
+	if (!egl->exts.KHR_image_base) {
+		return false;
+	}
+	if (!image) {
+		return true;
+	}
+	return egl->procs.eglDestroyImageKHR(egl->display, image);
+}
+
+bool wlr_egl_make_current(struct wlr_egl *egl) {
+	if (!eglMakeCurrent(egl->display, EGL_NO_SURFACE, EGL_NO_SURFACE,
+			egl->context)) {
+		wlr_log(WLR_ERROR, "eglMakeCurrent failed");
+		return false;
+	}
+	return true;
+}
+
+bool wlr_egl_unset_current(struct wlr_egl *egl) {
+	if (!eglMakeCurrent(egl->display, EGL_NO_SURFACE, EGL_NO_SURFACE,
+			EGL_NO_CONTEXT)) {
+		wlr_log(WLR_ERROR, "eglMakeCurrent failed");
+		return false;
+	}
+	return true;
+}
+
+bool wlr_egl_is_current(struct wlr_egl *egl) {
+	return eglGetCurrentContext() == egl->context;
+}
+
+void wlr_egl_save_context(struct wlr_egl_context *context) {
+	context->display = eglGetCurrentDisplay();
+	context->context = eglGetCurrentContext();
+	context->draw_surface = eglGetCurrentSurface(EGL_DRAW);
+	context->read_surface = eglGetCurrentSurface(EGL_READ);
+}
+
+bool wlr_egl_restore_context(struct wlr_egl_context *context) {
+	// If the saved context is a null-context, we must use the current
+	// display instead of the saved display because eglMakeCurrent() can't
+	// handle EGL_NO_DISPLAY.
+	EGLDisplay display = context->display == EGL_NO_DISPLAY ?
+		eglGetCurrentDisplay() : context->display;
+
+	// If the current display is also EGL_NO_DISPLAY, we assume that there
+	// is currently no context set and no action needs to be taken to unset
+	// the context.
+	if (display == EGL_NO_DISPLAY) {
+		return true;
+	}
+
+	return eglMakeCurrent(display, context->draw_surface,
+			context->read_surface, context->context);
+}
+
+EGLImageKHR wlr_egl_create_image_from_dmabuf(struct wlr_egl *egl,
+		struct wlr_dmabuf_attributes *attributes, bool *external_only) {
+	if (!egl->exts.KHR_image_base || !egl->exts.EXT_image_dma_buf_import) {
+		wlr_log(WLR_ERROR, "dmabuf import extension not present");
+		return NULL;
+	}
+
+	if (attributes->modifier != DRM_FORMAT_MOD_INVALID &&
+			attributes->modifier != DRM_FORMAT_MOD_LINEAR &&
+			!egl->has_modifiers) {
+		wlr_log(WLR_ERROR, "EGL implementation doesn't support modifiers");
+		return NULL;
+	}
+
+	unsigned int atti = 0;
+	EGLint attribs[50];
+	attribs[atti++] = EGL_WIDTH;
+	attribs[atti++] = attributes->width;
+	attribs[atti++] = EGL_HEIGHT;
+	attribs[atti++] = attributes->height;
+	attribs[atti++] = EGL_LINUX_DRM_FOURCC_EXT;
+	attribs[atti++] = attributes->format;
+
+	struct {
+		EGLint fd;
+		EGLint offset;
+		EGLint pitch;
+		EGLint mod_lo;
+		EGLint mod_hi;
+	} attr_names[WLR_DMABUF_MAX_PLANES] = {
+		{
+			EGL_DMA_BUF_PLANE0_FD_EXT,
+			EGL_DMA_BUF_PLANE0_OFFSET_EXT,
+			EGL_DMA_BUF_PLANE0_PITCH_EXT,
+			EGL_DMA_BUF_PLANE0_MODIFIER_LO_EXT,
+			EGL_DMA_BUF_PLANE0_MODIFIER_HI_EXT
+		}, {
+			EGL_DMA_BUF_PLANE1_FD_EXT,
+			EGL_DMA_BUF_PLANE1_OFFSET_EXT,
+			EGL_DMA_BUF_PLANE1_PITCH_EXT,
+			EGL_DMA_BUF_PLANE1_MODIFIER_LO_EXT,
+			EGL_DMA_BUF_PLANE1_MODIFIER_HI_EXT
+		}, {
+			EGL_DMA_BUF_PLANE2_FD_EXT,
+			EGL_DMA_BUF_PLANE2_OFFSET_EXT,
+			EGL_DMA_BUF_PLANE2_PITCH_EXT,
+			EGL_DMA_BUF_PLANE2_MODIFIER_LO_EXT,
+			EGL_DMA_BUF_PLANE2_MODIFIER_HI_EXT
+		}, {
+			EGL_DMA_BUF_PLANE3_FD_EXT,
+			EGL_DMA_BUF_PLANE3_OFFSET_EXT,
+			EGL_DMA_BUF_PLANE3_PITCH_EXT,
+			EGL_DMA_BUF_PLANE3_MODIFIER_LO_EXT,
+			EGL_DMA_BUF_PLANE3_MODIFIER_HI_EXT
+		}
+	};
+
+	for (int i = 0; i < attributes->n_planes; i++) {
+		attribs[atti++] = attr_names[i].fd;
+		attribs[atti++] = attributes->fd[i];
+		attribs[atti++] = attr_names[i].offset;
+		attribs[atti++] = attributes->offset[i];
+		attribs[atti++] = attr_names[i].pitch;
+		attribs[atti++] = attributes->stride[i];
+		if (egl->has_modifiers &&
+				attributes->modifier != DRM_FORMAT_MOD_INVALID) {
+			attribs[atti++] = attr_names[i].mod_lo;
+			attribs[atti++] = attributes->modifier & 0xFFFFFFFF;
+			attribs[atti++] = attr_names[i].mod_hi;
+			attribs[atti++] = attributes->modifier >> 32;
+		}
+	}
+
+	// Our clients don't expect our usage to trash the buffer contents
+	attribs[atti++] = EGL_IMAGE_PRESERVED_KHR;
+	attribs[atti++] = EGL_TRUE;
+
+	attribs[atti++] = EGL_NONE;
+	assert(atti < sizeof(attribs)/sizeof(attribs[0]));
+
+	EGLImageKHR image = egl->procs.eglCreateImageKHR(egl->display, EGL_NO_CONTEXT,
+		EGL_LINUX_DMA_BUF_EXT, NULL, attribs);
+	if (image == EGL_NO_IMAGE_KHR) {
+		wlr_log(WLR_ERROR, "eglCreateImageKHR failed");
+		return EGL_NO_IMAGE_KHR;
+	}
+
+	*external_only = !wlr_drm_format_set_has(&egl->dmabuf_render_formats,
+		attributes->format, attributes->modifier);
+	return image;
+}
+
+static int get_egl_dmabuf_formats(struct wlr_egl *egl, EGLint **formats) {
+	if (!egl->exts.EXT_image_dma_buf_import) {
+		wlr_log(WLR_DEBUG, "DMA-BUF 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.EXT_image_dma_buf_import_modifiers) {
+		static const EGLint fallback_formats[] = {
+			DRM_FORMAT_ARGB8888,
+			DRM_FORMAT_XRGB8888,
+		};
+		int num = sizeof(fallback_formats) / sizeof(fallback_formats[0]);
+
+		*formats = calloc(num, sizeof(**formats));
+		if (!*formats) {
+			wlr_log_errno(WLR_ERROR, "Allocation failed");
+			return -1;
+		}
+
+		memcpy(*formats, fallback_formats, num * sizeof(**formats));
+		return num;
+	}
+
+	EGLint num;
+	if (!egl->procs.eglQueryDmaBufFormatsEXT(egl->display, 0, NULL, &num)) {
+		wlr_log(WLR_ERROR, "Failed to query number of dmabuf formats");
+		return -1;
+	}
+
+	*formats = calloc(num, sizeof(**formats));
+	if (*formats == NULL) {
+		wlr_log(WLR_ERROR, "Allocation failed: %s", strerror(errno));
+		return -1;
+	}
+
+	if (!egl->procs.eglQueryDmaBufFormatsEXT(egl->display, num, *formats, &num)) {
+		wlr_log(WLR_ERROR, "Failed to query dmabuf format");
+		free(*formats);
+		return -1;
+	}
+	return num;
+}
+
+static int get_egl_dmabuf_modifiers(struct wlr_egl *egl, EGLint format,
+		uint64_t **modifiers, EGLBoolean **external_only) {
+	*modifiers = NULL;
+	*external_only = NULL;
+
+	if (!egl->exts.EXT_image_dma_buf_import) {
+		wlr_log(WLR_DEBUG, "DMA-BUF extension not present");
+		return -1;
+	}
+	if (!egl->exts.EXT_image_dma_buf_import_modifiers) {
+		return 0;
+	}
+
+	EGLint num;
+	if (!egl->procs.eglQueryDmaBufModifiersEXT(egl->display, format, 0,
+			NULL, NULL, &num)) {
+		wlr_log(WLR_ERROR, "Failed to query dmabuf number of modifiers");
+		return -1;
+	}
+	if (num == 0) {
+		return 0;
+	}
+
+	*modifiers = calloc(num, sizeof(**modifiers));
+	if (*modifiers == NULL) {
+		wlr_log_errno(WLR_ERROR, "Allocation failed");
+		return -1;
+	}
+	*external_only = calloc(num, sizeof(**external_only));
+	if (*external_only == NULL) {
+		wlr_log_errno(WLR_ERROR, "Allocation failed");
+		free(*modifiers);
+		*modifiers = NULL;
+		return -1;
+	}
+
+	if (!egl->procs.eglQueryDmaBufModifiersEXT(egl->display, format, num,
+			*modifiers, *external_only, &num)) {
+		wlr_log(WLR_ERROR, "Failed to query dmabuf modifiers");
+		free(*modifiers);
+		free(*external_only);
+		return -1;
+	}
+	return num;
+}
+
+const struct wlr_drm_format_set *wlr_egl_get_dmabuf_texture_formats(
+		struct wlr_egl *egl) {
+	return &egl->dmabuf_texture_formats;
+}
+
+const struct wlr_drm_format_set *wlr_egl_get_dmabuf_render_formats(
+		struct wlr_egl *egl) {
+	return &egl->dmabuf_render_formats;
+}
+
+static bool device_has_name(const drmDevice *device, const char *name) {
+	for (size_t i = 0; i < DRM_NODE_MAX; i++) {
+		if (!(device->available_nodes & (1 << i))) {
+			continue;
+		}
+		if (strcmp(device->nodes[i], name) == 0) {
+			return true;
+		}
+	}
+	return false;
+}
+
+static char *get_render_name(const char *name) {
+	uint32_t flags = 0;
+	int devices_len = drmGetDevices2(flags, NULL, 0);
+	if (devices_len < 0) {
+		wlr_log(WLR_ERROR, "drmGetDevices2 failed: %s", strerror(-devices_len));
+		return NULL;
+	}
+	drmDevice **devices = calloc(devices_len, sizeof(*devices));
+	if (devices == NULL) {
+		wlr_log_errno(WLR_ERROR, "Allocation failed");
+		return NULL;
+	}
+	devices_len = drmGetDevices2(flags, devices, devices_len);
+	if (devices_len < 0) {
+		free(devices);
+		wlr_log(WLR_ERROR, "drmGetDevices2 failed: %s", strerror(-devices_len));
+		return NULL;
+	}
+
+	const drmDevice *match = NULL;
+	for (int i = 0; i < devices_len; i++) {
+		if (device_has_name(devices[i], name)) {
+			match = devices[i];
+			break;
+		}
+	}
+
+	char *render_name = NULL;
+	if (match == NULL) {
+		wlr_log(WLR_ERROR, "Cannot find DRM device %s", name);
+	} else if (!(match->available_nodes & (1 << DRM_NODE_RENDER))) {
+		// Likely a split display/render setup. Pick the primary node and hope
+		// Mesa will open the right render node under-the-hood.
+		wlr_log(WLR_DEBUG, "DRM device %s has no render node, "
+			"falling back to primary node", name);
+		assert(match->available_nodes & (1 << DRM_NODE_PRIMARY));
+		render_name = strdup(match->nodes[DRM_NODE_PRIMARY]);
+	} else {
+		render_name = strdup(match->nodes[DRM_NODE_RENDER]);
+	}
+
+	for (int i = 0; i < devices_len; i++) {
+		drmFreeDevice(&devices[i]);
+	}
+	free(devices);
+
+	return render_name;
+}
+
+static int dup_egl_device_drm_fd(struct wlr_egl *egl) {
+	if (egl->device == EGL_NO_DEVICE_EXT || (!egl->exts.EXT_device_drm &&
+			!egl->exts.EXT_device_drm_render_node)) {
+		return -1;
+	}
+
+	char *render_name = NULL;
+#ifdef EGL_EXT_device_drm_render_node
+	if (egl->exts.EXT_device_drm_render_node) {
+		const char *name = egl->procs.eglQueryDeviceStringEXT(egl->device,
+			EGL_DRM_RENDER_NODE_FILE_EXT);
+		if (name == NULL) {
+			wlr_log(WLR_DEBUG, "EGL device has no render node");
+			return -1;
+		}
+		render_name = strdup(name);
+	}
+#endif
+
+	if (render_name == NULL) {
+		const char *primary_name = egl->procs.eglQueryDeviceStringEXT(egl->device,
+			EGL_DRM_DEVICE_FILE_EXT);
+		if (primary_name == NULL) {
+			wlr_log(WLR_ERROR,
+				"eglQueryDeviceStringEXT(EGL_DRM_DEVICE_FILE_EXT) failed");
+			return -1;
+		}
+
+		render_name = get_render_name(primary_name);
+		if (render_name == NULL) {
+			wlr_log(WLR_ERROR, "Can't find render node name for device %s",
+				primary_name);
+			return -1;
+		}
+	}
+
+	int render_fd = open(render_name, O_RDWR | O_NONBLOCK | O_CLOEXEC);
+	if (render_fd < 0) {
+		wlr_log_errno(WLR_ERROR, "Failed to open DRM render node %s",
+			render_name);
+		free(render_name);
+		return -1;
+	}
+	free(render_name);
+
+	return render_fd;
+}
+
+int wlr_egl_dup_drm_fd(struct wlr_egl *egl) {
+	int fd = dup_egl_device_drm_fd(egl);
+	if (fd >= 0) {
+		return fd;
+	}
+
+	// Fallback to GBM's FD if we can't use EGLDevice
+	if (egl->gbm_device == NULL) {
+		return -1;
+	}
+
+	fd = fcntl(gbm_device_get_fd(egl->gbm_device), F_DUPFD_CLOEXEC, 0);
+	if (fd < 0) {
+		wlr_log_errno(WLR_ERROR, "Failed to dup GBM FD");
+	}
+	return fd;
+}
diff --git a/render/fx_renderer/fx_framebuffer.c b/render/fx_renderer/fx_framebuffer.c
new file mode 100644
index 0000000..4de6439
--- /dev/null
+++ b/render/fx_renderer/fx_framebuffer.c
@@ -0,0 +1,136 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <wlr/interfaces/wlr_buffer.h>
+#include <wlr/render/allocator.h>
+#include <wlr/render/interface.h>
+#include <wlr/render/swapchain.h>
+#include <wlr/util/log.h>
+
+#include "render/egl.h"
+#include "render/fx_renderer/fx_renderer.h"
+
+static void handle_buffer_destroy(struct wlr_addon *addon) {
+	struct fx_framebuffer *buffer =
+		wl_container_of(addon, buffer, addon);
+	fx_framebuffer_release(buffer);
+}
+
+static const struct wlr_addon_interface buffer_addon_impl = {
+	.name = "fx_framebuffer",
+	.destroy = handle_buffer_destroy,
+};
+
+
+struct fx_framebuffer fx_framebuffer_create(void) {
+	return (struct fx_framebuffer) {
+		.initialized = false,
+		.fbo = -1,
+		.rbo = -1,
+		.wlr_buffer = NULL,
+		.image = NULL,
+	};
+}
+
+void fx_framebuffer_bind(struct fx_framebuffer *fx_buffer) {
+	glBindFramebuffer(GL_FRAMEBUFFER, fx_buffer->fbo);
+}
+
+void fx_framebuffer_bind_wlr_fbo(struct fx_renderer *renderer) {
+	glBindFramebuffer(GL_FRAMEBUFFER, renderer->wlr_main_buffer_fbo);
+}
+
+void fx_framebuffer_update(struct fx_renderer *fx_renderer, struct fx_framebuffer *fx_buffer,
+		int width, int height) {
+	struct wlr_output *output = fx_renderer->wlr_output;
+
+	fx_buffer->renderer = fx_renderer;
+
+	bool first_alloc = false;
+
+	if (!fx_buffer->wlr_buffer ||
+			fx_buffer->wlr_buffer->width != width ||
+			fx_buffer->wlr_buffer->height != height) {
+		wlr_buffer_drop(fx_buffer->wlr_buffer);
+		fx_buffer->wlr_buffer = wlr_allocator_create_buffer(output->allocator,
+				width, height, &output->swapchain->format);
+		first_alloc = true;
+	}
+
+	if (fx_buffer->fbo == (uint32_t) -1 || first_alloc) {
+		glGenFramebuffers(1, &fx_buffer->fbo);
+		first_alloc = true;
+	}
+
+	if (fx_buffer->rbo == (uint32_t) -1 || first_alloc) {
+		struct wlr_dmabuf_attributes dmabuf = {0};
+		if (!wlr_buffer_get_dmabuf(fx_buffer->wlr_buffer, &dmabuf)) {
+			goto error_buffer;
+		}
+
+		bool external_only;
+		fx_buffer->image = wlr_egl_create_image_from_dmabuf(fx_renderer->egl,
+			&dmabuf, &external_only);
+		if (fx_buffer->image == EGL_NO_IMAGE_KHR) {
+			goto error_buffer;
+		}
+
+		glGenRenderbuffers(1, &fx_buffer->rbo);
+		glBindRenderbuffer(GL_RENDERBUFFER, fx_buffer->rbo);
+		fx_renderer->procs.glEGLImageTargetRenderbufferStorageOES(GL_RENDERBUFFER,
+			fx_buffer->image);
+		glBindRenderbuffer(GL_RENDERBUFFER, 0);
+
+		glBindFramebuffer(GL_FRAMEBUFFER, fx_buffer->fbo);
+		glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
+			GL_RENDERBUFFER, fx_buffer->rbo);
+		GLenum fb_status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
+		glBindFramebuffer(GL_FRAMEBUFFER, 0);
+
+		if (fb_status != GL_FRAMEBUFFER_COMPLETE) {
+			wlr_log(WLR_ERROR, "Failed to create FBO");
+			goto error_image;
+		}
+	}
+
+	if (!fx_buffer->initialized) {
+		fx_buffer->initialized = true;
+
+		wlr_addon_init(&fx_buffer->addon, &fx_buffer->wlr_buffer->addons, fx_renderer,
+			&buffer_addon_impl);
+
+		wl_list_insert(&fx_renderer->buffers, &fx_buffer->link);
+	}
+
+	if (first_alloc) {
+		wlr_log(WLR_DEBUG, "Created GL FBO for buffer %dx%d",
+			fx_buffer->wlr_buffer->width, fx_buffer->wlr_buffer->height);
+	}
+
+	return;
+error_image:
+	wlr_egl_destroy_image(fx_renderer->egl, fx_buffer->image);
+error_buffer:
+	wlr_log(WLR_ERROR, "Could not create FX buffer! Aborting...");
+	abort();
+}
+
+void fx_framebuffer_release(struct fx_framebuffer *fx_buffer) {
+	// Release the framebuffer
+	wl_list_remove(&fx_buffer->link);
+	wlr_addon_finish(&fx_buffer->addon);
+
+	struct wlr_egl_context prev_ctx;
+	wlr_egl_save_context(&prev_ctx);
+	wlr_egl_make_current(fx_buffer->renderer->egl);
+
+	glDeleteFramebuffers(1, &fx_buffer->fbo);
+	fx_buffer->fbo = -1;
+	glDeleteRenderbuffers(1, &fx_buffer->rbo);
+	fx_buffer->rbo = -1;
+
+	wlr_egl_destroy_image(fx_buffer->renderer->egl, fx_buffer->image);
+
+	wlr_egl_restore_context(&prev_ctx);
+
+	fx_buffer->initialized = false;
+}
diff --git a/render/fx_renderer/fx_renderer.c b/render/fx_renderer/fx_renderer.c
index 730e314..7bc0be1 100644
--- a/render/fx_renderer/fx_renderer.c
+++ b/render/fx_renderer/fx_renderer.c
@@ -8,6 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <wlr/backend.h>
+#include <wlr/render/allocator.h>
 #include <wlr/render/egl.h>
 #include <wlr/render/gles2.h>
 #include <wlr/types/wlr_matrix.h>
@@ -178,7 +179,7 @@ static bool check_gl_ext(const char *exts, const char *ext) {
 static void load_gl_proc(void *proc_ptr, const char *name) {
 	void *proc = (void *)eglGetProcAddress(name);
 	if (proc == NULL) {
-		wlr_log(WLR_ERROR, "GLES2 RENDERER: eglGetProcAddress(%s) failed", name);
+		wlr_log(WLR_ERROR, "FX RENDERER: eglGetProcAddress(%s) failed", name);
 		abort();
 	}
 	*(void **)proc_ptr = proc;
@@ -187,7 +188,19 @@ static void load_gl_proc(void *proc_ptr, const char *name) {
 static void fx_renderer_handle_destroy(struct wlr_addon *addon) {
 	struct fx_renderer *renderer =
 		wl_container_of(addon, renderer, addon);
-	fx_renderer_fini(renderer);
+
+	struct fx_framebuffer *fx_buffer, *fx_buffer_tmp;
+	wl_list_for_each_safe(fx_buffer, fx_buffer_tmp, &renderer->buffers, link) {
+		fx_framebuffer_release(fx_buffer);
+	}
+
+	struct fx_texture *tex, *tex_tmp;
+	wl_list_for_each_safe(tex, tex_tmp, &renderer->textures, link) {
+		fx_texture_destroy(tex);
+	}
+
+	fx_stencilbuffer_release(&renderer->stencil_buffer);
+
 	free(renderer);
 }
 static const struct wlr_addon_interface fx_renderer_addon_impl = {
@@ -195,9 +208,9 @@ static const struct wlr_addon_interface fx_renderer_addon_impl = {
 	.destroy = fx_renderer_handle_destroy,
 };
 
-void fx_renderer_init_addon(struct wlr_egl *egl, struct wlr_addon_set *addons,
-		const void * owner) {
-	struct fx_renderer *renderer = fx_renderer_create(egl);
+void fx_renderer_init_addon(struct wlr_egl *egl, struct wlr_output *output,
+		struct wlr_addon_set *addons, const void * owner) {
+	struct fx_renderer *renderer = fx_renderer_create(egl, output);
 	if (!renderer) {
 		wlr_log(WLR_ERROR, "Failed to create fx_renderer");
 		abort();
@@ -216,32 +229,43 @@ struct fx_renderer *fx_renderer_addon_find(struct wlr_addon_set *addons,
 	return renderer;
 }
 
-struct fx_renderer *fx_renderer_create(struct wlr_egl *egl) {
+struct fx_renderer *fx_renderer_create(struct wlr_egl *egl,
+		struct wlr_output *output) {
 	struct fx_renderer *renderer = calloc(1, sizeof(struct fx_renderer));
 	if (renderer == NULL) {
 		return NULL;
 	}
 
+	wl_list_init(&renderer->buffers);
+	wl_list_init(&renderer->textures);
+
+	renderer->wlr_output = output;
+	renderer->egl = egl;
+
 	if (!eglMakeCurrent(wlr_egl_get_display(egl), EGL_NO_SURFACE, EGL_NO_SURFACE,
 			wlr_egl_get_context(egl))) {
-		wlr_log(WLR_ERROR, "GLES2 RENDERER: Could not make EGL current");
+		wlr_log(WLR_ERROR, "FX RENDERER: Could not make EGL current");
 		return NULL;
 	}
 
+	// Create the stencil buffer
 	renderer->stencil_buffer = fx_stencilbuffer_create();
 
+	// Create the FBOs
+	renderer->wlr_main_buffer_fbo = -1;
+
 	// get extensions
 	const char *exts_str = (const char *)glGetString(GL_EXTENSIONS);
 	if (exts_str == NULL) {
-		wlr_log(WLR_ERROR, "GLES2 RENDERER: Failed to get GL_EXTENSIONS");
+		wlr_log(WLR_ERROR, "FX RENDERER: Failed to get GL_EXTENSIONS");
 		return NULL;
 	}
 
-	wlr_log(WLR_INFO, "Creating scenefx GLES2 renderer");
+	wlr_log(WLR_INFO, "Creating scenefx FX renderer");
 	wlr_log(WLR_INFO, "Using %s", glGetString(GL_VERSION));
 	wlr_log(WLR_INFO, "GL vendor: %s", glGetString(GL_VENDOR));
 	wlr_log(WLR_INFO, "GL renderer: %s", glGetString(GL_RENDERER));
-	wlr_log(WLR_INFO, "Supported GLES2 extensions: %s", exts_str);
+	wlr_log(WLR_INFO, "Supported FX extensions: %s", exts_str);
 
 	// TODO: the rest of the gl checks
 	if (check_gl_ext(exts_str, "GL_OES_EGL_image_external")) {
@@ -250,6 +274,12 @@ struct fx_renderer *fx_renderer_create(struct wlr_egl *egl) {
 			"glEGLImageTargetTexture2DOES");
 	}
 
+	if (check_gl_ext(exts_str, "GL_OES_EGL_image")) {
+		renderer->exts.OES_egl_image = true;
+		load_gl_proc(&renderer->procs.glEGLImageTargetRenderbufferStorageOES,
+			"glEGLImageTargetRenderbufferStorageOES");
+	}
+
 	// quad fragment shader
 	if (!link_quad_program(&renderer->shaders.quad)) {
 		goto error;
@@ -276,11 +306,11 @@ struct fx_renderer *fx_renderer_create(struct wlr_egl *egl) {
 
 	if (!eglMakeCurrent(wlr_egl_get_display(egl),
 				EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT)) {
-		wlr_log(WLR_ERROR, "GLES2 RENDERER: Could not unset current EGL");
+		wlr_log(WLR_ERROR, "FX RENDERER: Could not unset current EGL");
 		goto error;
 	}
 
-	wlr_log(WLR_INFO, "GLES2 RENDERER: Shaders Initialized Successfully");
+	wlr_log(WLR_INFO, "FX RENDERER: Shaders Initialized Successfully");
 	return renderer;
 
 error:
@@ -293,24 +323,34 @@ error:
 
 	if (!eglMakeCurrent(wlr_egl_get_display(egl),
 				EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT)) {
-		wlr_log(WLR_ERROR, "GLES2 RENDERER: Could not unset current EGL");
+		wlr_log(WLR_ERROR, "FX RENDERER: Could not unset current EGL");
 	}
 
 	// TODO: more freeing?
 	free(renderer);
 
-	wlr_log(WLR_ERROR, "GLES2 RENDERER: Error Initializing Shaders");
+	wlr_log(WLR_ERROR, "FX RENDERER: Error Initializing Shaders");
 	return NULL;
 }
 
-void fx_renderer_fini(struct fx_renderer *renderer) {
-	fx_stencilbuffer_release(&renderer->stencil_buffer);
-}
-
 void fx_renderer_begin(struct fx_renderer *renderer, int width, int height) {
+	glViewport(0, 0, width, height);
+	renderer->viewport_width = width;
+	renderer->viewport_height = height;
+
+	// Store the wlr FBO
+	renderer->wlr_main_buffer_fbo =
+		wlr_gles2_renderer_get_current_fbo(renderer->wlr_output->renderer);
+	// Get the fx_texture
+	struct wlr_texture *wlr_texture = wlr_texture_from_buffer(
+			renderer->wlr_output->renderer, renderer->wlr_output->back_buffer);
+	wlr_gles2_texture_get_attribs(wlr_texture, &renderer->wlr_main_texture_attribs);
+	wlr_texture_destroy(wlr_texture);
+	// Add the stencil to the wlr fbo
 	fx_stencilbuffer_init(&renderer->stencil_buffer, width, height);
 
-	glViewport(0, 0, width, height);
+	// Finally bind the main wlr FBO
+	fx_framebuffer_bind_wlr_fbo(renderer);
 
 	// refresh projection matrix
 	matrix_projection(renderer->projection, width, height,
@@ -319,6 +359,9 @@ void fx_renderer_begin(struct fx_renderer *renderer, int width, int height) {
 	glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
 }
 
+void fx_renderer_end(struct fx_renderer *renderer) {
+}
+
 void fx_renderer_clear(const float color[static 4]) {
 	glClearColor(color[0], color[1], color[2], color[3]);
 	glClearStencil(0);
@@ -376,9 +419,16 @@ bool fx_render_subtexture_with_matrix(struct fx_renderer *renderer,
 		const struct wlr_box *dst_box, const float matrix[static 9],
 		float opacity, int corner_radius) {
 
-	assert(wlr_texture_is_gles2(wlr_texture));
 	struct wlr_gles2_texture_attribs texture_attrs;
-	wlr_gles2_texture_get_attribs(wlr_texture, &texture_attrs);
+	if (wlr_texture_is_gles2(wlr_texture)) {
+		wlr_gles2_texture_get_attribs(wlr_texture, &texture_attrs);
+	} else if (wlr_texture_is_fx(wlr_texture)) {
+		struct fx_texture *fx_texture = fx_get_texture(wlr_texture);
+		wlr_gles2_texture_get_fx_attribs(fx_texture, &texture_attrs);
+	} else {
+		wlr_log(WLR_ERROR, "Texture not GLES2 or FX. Aborting...");
+		abort();
+	}
 
 	struct tex_shader *shader = NULL;
 
diff --git a/render/fx_renderer/fx_texture.c b/render/fx_renderer/fx_texture.c
new file mode 100644
index 0000000..a8977fa
--- /dev/null
+++ b/render/fx_renderer/fx_texture.c
@@ -0,0 +1,335 @@
+#include <assert.h>
+#include <stdlib.h>
+#include <wlr/render/interface.h>
+#include <wlr/render/gles2.h>
+#include <wlr/types/wlr_buffer.h>
+#include <wlr/util/log.h>
+#include <drm_fourcc.h>
+
+#include "render/fx_renderer/fx_renderer.h"
+#include "render/pixel_format.h"
+#include "render/egl.h"
+
+static const struct wlr_texture_impl texture_impl;
+
+bool wlr_texture_is_fx(struct wlr_texture *wlr_texture) {
+	return wlr_texture->impl == &texture_impl;
+}
+
+struct fx_texture *fx_get_texture(struct wlr_texture *wlr_texture) {
+	assert(wlr_texture_is_fx(wlr_texture));
+	return (struct fx_texture *) wlr_texture;
+}
+
+static bool fx_texture_update_from_buffer(struct wlr_texture *wlr_texture,
+		struct wlr_buffer *buffer, const pixman_region32_t *damage) {
+	struct fx_texture *texture = fx_get_texture(wlr_texture);
+
+	if (texture->target != GL_TEXTURE_2D || texture->image != EGL_NO_IMAGE_KHR) {
+		return false;
+	}
+
+	void *data;
+	uint32_t format;
+	size_t stride;
+	if (!wlr_buffer_begin_data_ptr_access(buffer,
+			WLR_BUFFER_DATA_PTR_ACCESS_READ, &data, &format, &stride)) {
+		return false;
+	}
+
+	if (format != texture->drm_format) {
+		wlr_buffer_end_data_ptr_access(buffer);
+		return false;
+	}
+
+	const struct wlr_pixel_format_info *drm_fmt =
+		drm_get_pixel_format_info(texture->drm_format);
+	assert(drm_fmt);
+	if (pixel_format_info_pixels_per_block(drm_fmt) != 1) {
+		wlr_buffer_end_data_ptr_access(buffer);
+		wlr_log(WLR_ERROR, "Cannot update texture: block formats are not supported");
+		return false;
+	}
+
+	if (!pixel_format_info_check_stride(drm_fmt, stride, buffer->width)) {
+		wlr_buffer_end_data_ptr_access(buffer);
+		return false;
+	}
+
+	struct wlr_egl_context prev_ctx;
+	wlr_egl_save_context(&prev_ctx);
+	wlr_egl_make_current(texture->fx_renderer->egl);
+
+	glBindTexture(GL_TEXTURE_2D, texture->tex);
+
+	int rects_len = 0;
+	pixman_box32_t *rects = pixman_region32_rectangles(damage, &rects_len);
+
+	for (int i = 0; i < rects_len; i++) {
+		pixman_box32_t rect = rects[i];
+
+		glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, stride / drm_fmt->bytes_per_block);
+		glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, rect.x1);
+		glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, rect.y1);
+
+		int width = rect.x2 - rect.x1;
+		int height = rect.y2 - rect.y1;
+		glTexSubImage2D(GL_TEXTURE_2D, 0, rect.x1, rect.y1, width, height,
+			GL_RGBA, GL_UNSIGNED_BYTE, data);
+	}
+
+	glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0);
+	glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0);
+	glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0);
+
+	glBindTexture(GL_TEXTURE_2D, 0);
+
+	wlr_egl_restore_context(&prev_ctx);
+
+	wlr_buffer_end_data_ptr_access(buffer);
+
+	return true;
+}
+
+static bool fx_texture_invalidate(struct fx_texture *texture) {
+	if (texture->image == EGL_NO_IMAGE_KHR) {
+		return false;
+	}
+	if (texture->target == GL_TEXTURE_EXTERNAL_OES) {
+		// External changes are immediately made visible by the GL implementation
+		return true;
+	}
+
+	struct wlr_egl_context prev_ctx;
+	wlr_egl_save_context(&prev_ctx);
+	wlr_egl_make_current(texture->fx_renderer->egl);
+
+	glBindTexture(texture->target, texture->tex);
+	texture->fx_renderer->procs.glEGLImageTargetTexture2DOES(texture->target,
+		texture->image);
+	glBindTexture(texture->target, 0);
+
+	wlr_egl_restore_context(&prev_ctx);
+
+	return true;
+}
+
+void fx_texture_destroy(struct fx_texture *texture) {
+	wl_list_remove(&texture->link);
+	if (texture->buffer != NULL) {
+		wlr_addon_finish(&texture->buffer_addon);
+	}
+
+	struct wlr_egl_context prev_ctx;
+	wlr_egl_save_context(&prev_ctx);
+	wlr_egl_make_current(texture->fx_renderer->egl);
+
+	glDeleteTextures(1, &texture->tex);
+	wlr_egl_destroy_image(texture->fx_renderer->egl, texture->image);
+
+	wlr_egl_restore_context(&prev_ctx);
+
+	free(texture);
+}
+
+static void fx_texture_unref(struct wlr_texture *wlr_texture) {
+	struct fx_texture *texture = fx_get_texture(wlr_texture);
+	if (texture->buffer != NULL) {
+		// Keep the texture around, in case the buffer is re-used later. We're
+		// still listening to the buffer's destroy event.
+		wlr_buffer_unlock(texture->buffer);
+	} else {
+		fx_texture_destroy(texture);
+	}
+}
+
+static const struct wlr_texture_impl texture_impl = {
+	.update_from_buffer = fx_texture_update_from_buffer,
+	.destroy = fx_texture_unref,
+};
+
+static struct fx_texture *fx_texture_create(
+		struct fx_renderer *renderer, uint32_t width, uint32_t height) {
+	struct fx_texture *texture = calloc(1, sizeof(struct fx_texture));
+	if (texture == NULL) {
+		wlr_log_errno(WLR_ERROR, "Allocation failed");
+		return NULL;
+	}
+	wlr_texture_init(&texture->wlr_texture, renderer->wlr_output->renderer,
+			&texture_impl, width, height);
+	texture->fx_renderer = renderer;
+	wl_list_insert(&renderer->textures, &texture->link);
+	return texture;
+}
+
+static struct fx_texture *fx_texture_from_pixels(
+		struct fx_renderer *renderer,
+		uint32_t drm_format, uint32_t stride, uint32_t width,
+		uint32_t height, const void *data) {
+	const struct wlr_pixel_format_info *drm_fmt =
+		drm_get_pixel_format_info(drm_format);
+	assert(drm_fmt);
+
+	if (pixel_format_info_pixels_per_block(drm_fmt) != 1) {
+		wlr_log(WLR_ERROR, "Cannot upload texture: block formats are not supported");
+		return NULL;
+	}
+
+	if (!pixel_format_info_check_stride(drm_fmt, stride, width)) {
+		return NULL;
+	}
+
+	struct fx_texture *texture =
+		fx_texture_create(renderer, width, height);
+	if (texture == NULL) {
+		return NULL;
+	}
+	texture->target = GL_TEXTURE_2D;
+	texture->has_alpha = false;
+	texture->drm_format = DRM_FORMAT_XBGR8888;
+
+	struct wlr_egl_context prev_ctx;
+	wlr_egl_save_context(&prev_ctx);
+	wlr_egl_make_current(renderer->egl);
+
+	glGenTextures(1, &texture->tex);
+	glBindTexture(GL_TEXTURE_2D, texture->tex);
+
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, stride / drm_fmt->bytes_per_block);
+	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, width, height, 0,
+		GL_RGBA, GL_UNSIGNED_BYTE, data);
+	glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, 0);
+
+	glBindTexture(GL_TEXTURE_2D, 0);
+
+	wlr_egl_restore_context(&prev_ctx);
+
+	return texture;
+}
+
+static struct wlr_texture *fx_texture_from_dmabuf(
+		struct fx_renderer *renderer,
+		struct wlr_dmabuf_attributes *attribs) {
+
+	if (!renderer->procs.glEGLImageTargetTexture2DOES) {
+		return NULL;
+	}
+
+	struct fx_texture *texture =
+		fx_texture_create(renderer, attribs->width, attribs->height);
+	if (texture == NULL) {
+		return NULL;
+	}
+	texture->drm_format = DRM_FORMAT_INVALID; // texture can't be written anyways
+
+	const struct wlr_pixel_format_info *drm_fmt =
+		drm_get_pixel_format_info(attribs->format);
+	if (drm_fmt != NULL) {
+		texture->has_alpha = drm_fmt->has_alpha;
+	} else {
+		// We don't know, assume the texture has an alpha channel
+		texture->has_alpha = true;
+	}
+
+	struct wlr_egl_context prev_ctx;
+	wlr_egl_save_context(&prev_ctx);
+	wlr_egl_make_current(renderer->egl);
+
+	bool external_only;
+	texture->image =
+		wlr_egl_create_image_from_dmabuf(renderer->egl, attribs, &external_only);
+	if (texture->image == EGL_NO_IMAGE_KHR) {
+		wlr_log(WLR_ERROR, "Failed to create EGL image from DMA-BUF");
+		wlr_egl_restore_context(&prev_ctx);
+		wl_list_remove(&texture->link);
+		free(texture);
+		return NULL;
+	}
+
+	texture->target = external_only ? GL_TEXTURE_EXTERNAL_OES : GL_TEXTURE_2D;
+
+	glGenTextures(1, &texture->tex);
+	glBindTexture(texture->target, texture->tex);
+	glTexParameteri(texture->target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
+	glTexParameteri(texture->target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
+	glTexParameteri(texture->target, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
+	glTexParameteri(texture->target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
+	renderer->procs.glEGLImageTargetTexture2DOES(texture->target, texture->image);
+	glBindTexture(texture->target, 0);
+
+	wlr_egl_restore_context(&prev_ctx);
+
+	return &texture->wlr_texture;
+}
+
+static void texture_handle_buffer_destroy(struct wlr_addon *addon) {
+	struct fx_texture *texture =
+		wl_container_of(addon, texture, buffer_addon);
+	fx_texture_destroy(texture);
+}
+
+static const struct wlr_addon_interface texture_addon_impl = {
+	.name = "fx_texture",
+	.destroy = texture_handle_buffer_destroy,
+};
+
+static struct fx_texture *fx_texture_from_dmabuf_buffer(
+		struct fx_renderer *renderer, struct wlr_buffer *buffer,
+		struct wlr_dmabuf_attributes *dmabuf) {
+	struct wlr_addon *addon =
+		wlr_addon_find(&buffer->addons, renderer, &texture_addon_impl);
+	if (addon != NULL) {
+		struct fx_texture *texture =
+			wl_container_of(addon, texture, buffer_addon);
+		if (!fx_texture_invalidate(texture)) {
+			wlr_log(WLR_ERROR, "Failed to invalidate texture");
+			return false;
+		}
+		wlr_buffer_lock(texture->buffer);
+		return texture;
+	}
+
+	struct wlr_texture *wlr_texture =
+		fx_texture_from_dmabuf(renderer, dmabuf);
+	if (wlr_texture == NULL) {
+		return false;
+	}
+
+	struct fx_texture *texture = fx_get_texture(wlr_texture);
+	texture->buffer = wlr_buffer_lock(buffer);
+	wlr_addon_init(&texture->buffer_addon, &buffer->addons,
+		renderer, &texture_addon_impl);
+
+	return texture;
+}
+
+struct fx_texture *fx_texture_from_buffer(struct fx_renderer *renderer,
+		struct wlr_buffer *buffer) {
+	void *data;
+	uint32_t format;
+	size_t stride;
+	struct wlr_dmabuf_attributes dmabuf;
+	if (wlr_buffer_get_dmabuf(buffer, &dmabuf)) {
+		return fx_texture_from_dmabuf_buffer(renderer, buffer, &dmabuf);
+	} else if (wlr_buffer_begin_data_ptr_access(buffer,
+			WLR_BUFFER_DATA_PTR_ACCESS_READ, &data, &format, &stride)) {
+		struct fx_texture *tex = fx_texture_from_pixels(renderer,
+			format, stride, buffer->width, buffer->height, data);
+		wlr_buffer_end_data_ptr_access(buffer);
+		return tex;
+	} else {
+		return NULL;
+	}
+}
+
+void wlr_gles2_texture_get_fx_attribs(struct fx_texture *texture,
+		struct wlr_gles2_texture_attribs *attribs) {
+	memset(attribs, 0, sizeof(*attribs));
+	attribs->target = texture->target;
+	attribs->tex = texture->tex;
+	attribs->has_alpha = texture->has_alpha;
+}
diff --git a/render/fx_renderer/meson.build b/render/fx_renderer/meson.build
index 394caa3..f6d44ae 100644
--- a/render/fx_renderer/meson.build
+++ b/render/fx_renderer/meson.build
@@ -7,7 +7,9 @@ endif
 
 wlr_files += files(
 	'matrix.c',
+	'fx_framebuffer.c',
 	'fx_stencilbuffer.c',
+	'fx_texture.c',
 	'fx_renderer.c',
 )
 
diff --git a/render/meson.build b/render/meson.build
index 4dd5c6a..56579ee 100644
--- a/render/meson.build
+++ b/render/meson.build
@@ -1,5 +1,6 @@
 wlr_files += files(
 	'pixel_format.c',
+	'egl.c',
 )
 
 subdir('fx_renderer')