render/texture: add width and height fields

Instead of requiring compositors to call wlr_texture_get_size each time
they want to access the texture's size, expose this information as
wlr_texture fields.

3 files changed, 5 insertions, 3 deletions

diff --git a/include/render/gles2.h b/include/render/gles2.h
index 858960d5..d9ddfe6c 100644
--- a/include/render/gles2.h
+++ b/include/render/gles2.h
@@ -82,7 +82,6 @@ struct wlr_gles2_texture {
 
 	EGLImageKHR image;
 
-	int width, height;
 	bool inverted_y;
 	bool has_alpha;
 
diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h
index 6936afa3..48ef4286 100644
--- a/include/wlr/render/interface.h
+++ b/include/wlr/render/interface.h
@@ -70,7 +70,6 @@ void wlr_renderer_init(struct wlr_renderer *renderer,
 	const struct wlr_renderer_impl *impl);
 
 struct wlr_texture_impl {
-	void (*get_size)(struct wlr_texture *texture, int *width, int *height);
 	bool (*is_opaque)(struct wlr_texture *texture);
 	bool (*write_pixels)(struct wlr_texture *texture,
 		uint32_t stride, uint32_t width, uint32_t height,
@@ -82,6 +81,6 @@ struct wlr_texture_impl {
 };
 
 void wlr_texture_init(struct wlr_texture *texture,
-	const struct wlr_texture_impl *impl);
+	const struct wlr_texture_impl *impl, uint32_t width, uint32_t height);
 
 #endif
diff --git a/include/wlr/render/wlr_texture.h b/include/wlr/render/wlr_texture.h
index f2e6a37d..71ce5e7c 100644
--- a/include/wlr/render/wlr_texture.h
+++ b/include/wlr/render/wlr_texture.h
@@ -18,6 +18,7 @@ struct wlr_texture_impl;
 
 struct wlr_texture {
 	const struct wlr_texture_impl *impl;
+	uint32_t width, height;
 };
 
 /**
@@ -43,6 +44,9 @@ struct wlr_texture *wlr_texture_from_dmabuf(struct wlr_renderer *renderer,
 
 /**
  * Get the texture width and height.
+ *
+ * This function is deprecated. Access wlr_texture's width and height fields
+ * directly instead.
  */
 void wlr_texture_get_size(struct wlr_texture *texture, int *width, int *height);