Implement drm (egl) buffer attaching

render/gles2/renderer.c

@@ -2,14 +2,17 @@
 #include <stdlib.h>
 #include <assert.h>
 #include <GLES2/gl2.h>
+#include <GLES2/gl2ext.h>
 #include <wayland-util.h>
 #include <wayland-server-protocol.h>
 #include <wlr/render.h>
 #include <wlr/render/interface.h>
 #include <wlr/render/matrix.h>
 #include <wlr/util/log.h>
+#include "backend/egl.h"
 #include "render/gles2.h"
 
+PFNGLEGLIMAGETARGETTEXTURE2DOESPROC glEGLImageTargetTexture2DOES = NULL;
 struct shaders shaders;
 
 static bool compile_shader(GLuint type, const GLchar *src, GLuint *shader) {
@@ -65,13 +68,36 @@ static void init_default_shaders() {
 	if (!compile_program(quad_vertex_src, ellipse_fragment_src, &shaders.ellipse)) {
 		goto error;
 	}
+	if (glEGLImageTargetTexture2DOES) {
+		if (!compile_program(quad_vertex_src, fragment_src_external, &shaders.external)) {
+			goto error;
+		}
+	}
+
 	wlr_log(L_DEBUG, "Compiled default shaders");
 	return;
 error:
 	wlr_log(L_ERROR, "Failed to set up default shaders!");
 }
 
+static void init_image_ext() {
+	if (glEGLImageTargetTexture2DOES)
+		return;
+
+	const char *exts = (const char*) glGetString(GL_EXTENSIONS);
+	if (strstr(exts, "GL_OES_EGL_image_external")) {
+ 		glEGLImageTargetTexture2DOES = (PFNGLEGLIMAGETARGETTEXTURE2DOESPROC)
+			eglGetProcAddress("glEGLImageTargetTexture2DOES");
+	}
+
+	if (!glEGLImageTargetTexture2DOES) {
+		wlr_log(L_INFO, "Failed to load glEGLImageTargetTexture2DOES "
+			"Will not be able to attach drm buffers");
+	}
+}
+
 static void init_globals() {
+	init_image_ext();
 	init_default_shaders();
 }
 
@@ -179,7 +205,7 @@ static struct wlr_renderer_impl wlr_renderer_impl = {
 	.destroy = wlr_gles2_destroy
 };
 
-struct wlr_renderer *wlr_gles2_renderer_init() {
+struct wlr_renderer *wlr_gles2_renderer_init(struct wlr_egl *egl) {
 	init_globals();
 	return wlr_renderer_init(NULL, &wlr_renderer_impl);
 }

render/gles2/shaders.c

@@ -90,3 +90,13 @@ const GLchar fragment_src_rgbx[] =
 "   gl_FragColor.rgb = alpha * texture2D(tex, v_texcoord).rgb;"
 "   gl_FragColor.a = alpha;"
 "}";
+
+const GLchar fragment_src_external[] =
+"#extension GL_OES_EGL_image_external : require\n"
+"precision mediump float;"
+"uniform samplerExternalOES texture0;"
+"varying vec2 v_uv;"
+"void main() {"
+"  vec4 col = texture2D(texture0, v_uv);"
+"  gl_FragColor = vec4(col.rgb, col.a);"
+"}";

render/gles2/texture.c

@@ -10,6 +10,26 @@
 #include <wlr/render/matrix.h>
 #include <wlr/util/log.h>
 #include "render/gles2.h"
+#include "backend/egl.h"
+
+static struct pixel_format external_pixel_format = {
+	.wl_format = 0,
+	.depth = 0,
+	.bpp = 0,
+	.gl_format = 0,
+	.gl_type = 0,
+	.shader = &shaders.external
+};
+
+static void gles2_texture_gen_texture(struct wlr_texture_state *surface) {
+	if (surface->tex_id)
+		return;
+
+	GL_CALL(glGenTextures(1, &surface->tex_id));
+	GL_CALL(glBindTexture(GL_TEXTURE_2D, surface->tex_id));
+	GL_CALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE));
+	GL_CALL(glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE));
+}
 
 static bool gles2_texture_upload_pixels(struct wlr_texture_state *texture,
 		enum wl_shm_format format, int stride, int width, int height,
@@ -24,7 +44,8 @@ static bool gles2_texture_upload_pixels(struct wlr_texture_state *texture,
 	texture->wlr_texture->height = height;
 	texture->wlr_texture->format = format;
 	texture->pixel_format = fmt;
-	GL_CALL(glGenTextures(1, &texture->tex_id));
+
+	gles2_texture_gen_texture(texture);
 	GL_CALL(glBindTexture(GL_TEXTURE_2D, texture->tex_id));
 	GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, stride));
 	GL_CALL(glTexImage2D(GL_TEXTURE_2D, 0, fmt->gl_format, width, height, 0,
@@ -72,7 +93,7 @@ static bool gles2_texture_upload_shm(struct wlr_texture_state *texture,
 	texture->wlr_texture->format = format;
 	texture->pixel_format = fmt;
 
-	GL_CALL(glGenTextures(1, &texture->tex_id));
+	gles2_texture_gen_texture(texture);
 	GL_CALL(glBindTexture(GL_TEXTURE_2D, texture->tex_id));
 	GL_CALL(glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, pitch));
 	GL_CALL(glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0));
@@ -109,6 +130,62 @@ static bool gles2_texture_update_shm(struct wlr_texture_state *texture,
 	GL_CALL(glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0));
 
 	wl_shm_buffer_end_access(buffer);
+
+	return true;
+}
+
+static bool gles2_texture_upload_drm(struct wlr_texture_state *texture,
+		struct wl_resource* buf) {
+	if (!glEGLImageTargetTexture2DOES) {
+		return false;
+	}
+
+	EGLint format;
+	if (!wlr_egl_query_buffer(buf, EGL_TEXTURE_FORMAT, &format)) {
+		wlr_log(L_INFO, "upload_drm called with no drm buffer");
+		return false;
+	}
+
+	wlr_egl_query_buffer(buf, EGL_WIDTH, (EGLint*) &texture->wlr_texture->width);
+	wlr_egl_query_buffer(buf, EGL_HEIGHT, (EGLint*) &texture->wlr_texture->height);
+
+	EGLint inverted_y;
+	wlr_egl_query_buffer(buf, EGL_WAYLAND_Y_INVERTED_WL, &inverted_y);
+
+	GLenum target;
+	const struct pixel_format *pf;
+	switch (format) {
+	case EGL_TEXTURE_RGB:
+	case EGL_TEXTURE_RGBA:
+		target = GL_TEXTURE_2D;
+		pf = gl_format_for_wl_format(WL_SHM_FORMAT_ARGB8888);
+		break;
+	case EGL_TEXTURE_EXTERNAL_WL:
+		target = GL_TEXTURE_EXTERNAL_OES;
+		pf = &external_pixel_format;
+		break;
+	default:
+		wlr_log(L_ERROR, "invalid/unsupported egl buffer format");
+		return false;
+	}
+
+	gles2_texture_gen_texture(texture);
+	GL_CALL(glBindTexture(GL_TEXTURE_2D, texture->tex_id));
+
+	EGLint attribs[] = { EGL_WAYLAND_PLANE_WL, 0, EGL_NONE };
+	texture->image = wlr_egl_create_image(EGL_WAYLAND_BUFFER_WL,
+		(EGLClientBuffer*) buf, attribs);
+	if (!texture->image) {
+		wlr_log(L_ERROR, "failed to create egl image: %s", egl_error());
+ 		return false;
+	}
+
+	GL_CALL(glActiveTexture(GL_TEXTURE0));
+	GL_CALL(glBindTexture(target, texture->tex_id));
+	GL_CALL(glEGLImageTargetTexture2DOES(target, texture->image));
+	texture->wlr_texture->valid = true;
+	texture->pixel_format = pf;
+
 	return true;
 }
 
@@ -142,6 +219,7 @@ static struct wlr_texture_impl wlr_texture_impl = {
 	.update_pixels = gles2_texture_update_pixels,
 	.upload_shm = gles2_texture_upload_shm,
 	.update_shm = gles2_texture_update_shm,
+	.upload_drm = gles2_texture_upload_drm,
 	.get_matrix = gles2_texture_get_matrix,
 	.bind = gles2_texture_bind,
 	.destroy = gles2_texture_destroy,

render/wlr_texture.c

@@ -43,6 +43,11 @@ bool wlr_texture_update_shm(struct wlr_texture *texture, uint32_t format,
 			x, y, width, height, shm);
 }
 
+bool wlr_texture_upload_drm(struct wlr_texture *texture,
+		struct wl_resource *drm_buffer) {
+	return texture->impl->upload_drm(texture->state, drm_buffer);
+}
+
 void wlr_texture_get_matrix(struct wlr_texture *texture,
 		float (*matrix)[16], const float (*projection)[16], int x, int y) {
 	texture->impl->get_matrix(texture->state, matrix, projection, x, y);