Merge branch 'master' into screencontent

1 files changed, 9 insertions, 14 deletions

diff --git a/include/wlr/render/egl.h b/include/wlr/render/egl.h
index 39b1d3d9..6b887f4f 100644
--- a/include/wlr/render/egl.h
+++ b/include/wlr/render/egl.h
@@ -16,13 +16,15 @@ struct wlr_egl {
 	const char *exts_str;
 
 	struct {
-		bool buffer_age;
-		bool swap_buffers_with_damage;
-		bool dmabuf_import;
-		bool dmabuf_import_modifiers;
-		bool dmabuf_export;
-		bool bind_wayland_display;
-	} egl_exts;
+		bool bind_wayland_display_wl;
+		bool buffer_age_ext;
+		bool image_base_khr;
+		bool image_dma_buf_export_mesa;
+		bool image_dmabuf_import_ext;
+		bool image_dmabuf_import_modifiers_ext;
+		bool swap_buffers_with_damage_ext;
+		bool swap_buffers_with_damage_khr;
+	} exts;
 
 	struct wl_display *wl_display;
 };
@@ -69,13 +71,6 @@ EGLImageKHR wlr_egl_create_image_from_dmabuf(struct wlr_egl *egl,
 	struct wlr_dmabuf_attributes *attributes);
 
 /**
- * Try to import the given dmabuf. On success return true false otherwise.
- * If this succeeds the dmabuf can be used for rendering on a texture
- */
-bool wlr_egl_check_import_dmabuf(struct wlr_egl *egl,
-	struct wlr_dmabuf_attributes *attributes);
-
-/**
  * Get the available dmabuf formats
  */
 int wlr_egl_get_dmabuf_formats(struct wlr_egl *egl, int **formats);