Merge branch 'master' into xwayland-dnd

1 files changed, 29 insertions, 34 deletions

diff --git a/render/wlr_texture.c b/render/wlr_texture.c
index 33c91822..9aecfd98 100644
--- a/render/wlr_texture.c
+++ b/render/wlr_texture.c
@@ -1,3 +1,4 @@
+#include <assert.h>
 #include <stdbool.h>
 #include <stdlib.h>
 #include <wlr/render/interface.h>
@@ -5,8 +6,9 @@
 
 void wlr_texture_init(struct wlr_texture *texture,
 		const struct wlr_texture_impl *impl) {
+	assert(impl->get_size);
+	assert(impl->write_pixels);
 	texture->impl = impl;
-	wl_signal_init(&texture->destroy_signal);
 }
 
 void wlr_texture_destroy(struct wlr_texture *texture) {
@@ -17,45 +19,38 @@ void wlr_texture_destroy(struct wlr_texture *texture) {
 	}
 }
 
-bool wlr_texture_upload_pixels(struct wlr_texture *texture, uint32_t format,
-		int stride, int width, int height, const unsigned char *pixels) {
-	return texture->impl->upload_pixels(texture, format, stride,
-			width, height, pixels);
+struct wlr_texture *wlr_texture_from_pixels(struct wlr_renderer *renderer,
+		enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width,
+		uint32_t height, const void *data) {
+	return renderer->impl->texture_from_pixels(renderer, wl_fmt, stride, width,
+		height, data);
 }
 
-bool wlr_texture_update_pixels(struct wlr_texture *texture,
-		enum wl_shm_format format, int stride, int x, int y,
-		int width, int height, const unsigned char *pixels) {
-	return texture->impl->update_pixels(texture, format, stride, x, y,
-			width, height, pixels);
-}
-
-bool wlr_texture_upload_shm(struct wlr_texture *texture, uint32_t format,
-		struct wl_shm_buffer *shm) {
-	return texture->impl->upload_shm(texture, format, shm);
-}
-
-bool wlr_texture_update_shm(struct wlr_texture *texture, uint32_t format,
-		int x, int y, int width, int height, struct wl_shm_buffer *shm) {
-	return texture->impl->update_shm(texture, 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, drm_buffer);
+struct wlr_texture *wlr_texture_from_wl_drm(struct wlr_renderer *renderer,
+		struct wl_resource *data) {
+	if (!renderer->impl->texture_from_wl_drm) {
+		return NULL;
+	}
+	return renderer->impl->texture_from_wl_drm(renderer, data);
 }
 
-bool wlr_texture_upload_eglimage(struct wlr_texture *texture,
-		EGLImageKHR image, uint32_t width, uint32_t height) {
-	return texture->impl->upload_eglimage(texture, image, width, height);
+struct wlr_texture *wlr_texture_from_dmabuf(struct wlr_renderer *renderer,
+		struct wlr_dmabuf_buffer_attribs *attribs) {
+	if (!renderer->impl->texture_from_dmabuf) {
+		return NULL;
+	}
+	return renderer->impl->texture_from_dmabuf(renderer, attribs);
 }
 
-bool wlr_texture_upload_dmabuf(struct wlr_texture *texture,
-		struct wl_resource *dmabuf_resource) {
-	return texture->impl->upload_dmabuf(texture, dmabuf_resource);
+void wlr_texture_get_size(struct wlr_texture *texture, int *width,
+		int *height) {
+	return texture->impl->get_size(texture, width, height);
 }
 
-void wlr_texture_get_buffer_size(struct wlr_texture *texture, struct wl_resource
-		*resource, int *width, int *height) {
-	texture->impl->get_buffer_size(texture, resource, width, height);
+bool wlr_texture_write_pixels(struct wlr_texture *texture,
+		enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width,
+		uint32_t height, uint32_t src_x, uint32_t src_y, uint32_t dst_x,
+		uint32_t dst_y, const void *data) {
+	return texture->impl->write_pixels(texture, wl_fmt, stride, width, height,
+		src_x, src_y, dst_x, dst_y, data);
 }