1 files changed, 15 insertions, 17 deletions

diff --git a/render/wlr_texture.c b/render/wlr_texture.c
index 0d4362dc..d2bcca07 100644
--- a/render/wlr_texture.c
+++ b/render/wlr_texture.c
@@ -2,53 +2,51 @@
 #include <stdbool.h>
 #include <wlr/render/interface.h>
 
-struct wlr_texture *wlr_texture_init(struct wlr_texture_state *state,
+void wlr_texture_init(struct wlr_texture *texture,
 		struct wlr_texture_impl *impl) {
-	struct wlr_texture *t = calloc(sizeof(struct wlr_texture), 1);
-	t->state = state;
-	t->impl = impl;
-	return t;
+	texture->impl = impl;
+	wl_signal_init(&texture->destroy_signal);
 }
 
 void wlr_texture_destroy(struct wlr_texture *texture) {
-	texture->impl->destroy(texture->state);
-	free(texture);
+	if (texture->impl->destroy) {
+		texture->impl->destroy(texture);
+	}
 }
 
 void wlr_texture_bind(struct wlr_texture *texture) {
-	texture->impl->bind(texture->state);
+	texture->impl->bind(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->state,
-			format, stride, width, height, pixels);
+	return texture->impl->upload_pixels(texture, format, stride,
+			width, height, pixels);
 }
 
 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->state,
-			format, stride, x, y, width, height, 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->state, format, 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->state, format,
-			x, y, width, height, 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->state, drm_buffer);
+	return texture->impl->upload_drm(texture, 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);
+	texture->impl->get_matrix(texture, matrix, projection, x, y);
 }