From 876f07e9f13946609047e8e32ca7918548315e1c Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Thu, 15 Mar 2018 19:31:02 +0100
Subject: renderer: replace wlr_texture_get_matrix by wlr_render_texture

---
 include/wlr/render.h           | 41 ++++++++++++-----------------------------
 include/wlr/render/interface.h |  2 --
 2 files changed, 12 insertions(+), 31 deletions(-)

(limited to 'include')

diff --git a/include/wlr/render.h b/include/wlr/render.h
index c3bf5c97..01d05fb1 100644
--- a/include/wlr/render.h
+++ b/include/wlr/render.h
@@ -25,21 +25,15 @@ void wlr_renderer_scissor(struct wlr_renderer *r, struct wlr_box *box);
  */
 struct wlr_texture *wlr_render_texture_create(struct wlr_renderer *r);
 /**
- * Renders the requested texture using the provided matrix. A typical texture
- * rendering goes like so:
- *
- * 	struct wlr_renderer *renderer;
- * 	struct wlr_texture *texture;
- * 	float projection[9];
- * 	float matrix[9];
- * 	wlr_texture_get_matrix(texture, matrix, projection, 123, 321);
- * 	wlr_render_texture_with_matrix(renderer, texture, matrix, 0.5f);
- *
- * This will render the texture at <123, 321> with an alpha channel of 0.5.
+ * Renders the requested texture.
+ */
+bool wlr_render_texture(struct wlr_renderer *r, struct wlr_texture *texture,
+	const float projection[static 9], int x, int y, float alpha);
+/**
+ * Renders the requested texture using the provided matrix.
  */
 bool wlr_render_texture_with_matrix(struct wlr_renderer *r,
 	struct wlr_texture *texture, const float matrix[static 9], float alpha);
-
 /**
  * Renders a solid quad in the specified color.
  */
@@ -95,22 +89,22 @@ struct wlr_texture {
  * returns.
  */
 bool wlr_texture_upload_pixels(struct wlr_texture *tex,
-		enum wl_shm_format format, int stride, int width, int height,
-		const unsigned char *pixels);
+	enum wl_shm_format format, int stride, int width, int height,
+	const unsigned char *pixels);
 /**
  * Copies pixels to this texture. The buffer is not accessed after this function
  * returns. Under some circumstances, this function may re-upload the entire
  * buffer - therefore, the entire buffer must be valid.
  */
 bool wlr_texture_update_pixels(struct wlr_texture *surf,
-		enum wl_shm_format format, int stride, int x, int y,
-		int width, int height, const unsigned char *pixels);
+	enum wl_shm_format format, int stride, int x, int y,
+	int width, int height, const unsigned char *pixels);
 /**
  * Copies pixels from a wl_shm_buffer into this texture. The buffer is not
  * accessed after this function returns.
  */
 bool wlr_texture_upload_shm(struct wlr_texture *tex, uint32_t format,
-		struct wl_shm_buffer *shm);
+	struct wl_shm_buffer *shm);
 
 /**
  * Attaches the contents from the given wl_drm wl_buffer resource onto the
@@ -132,18 +126,7 @@ bool wlr_texture_upload_dmabuf(struct wlr_texture *tex,
  * must be valid.
  */
 bool wlr_texture_update_shm(struct wlr_texture *surf, uint32_t format,
-		int x, int y, int width, int height, struct wl_shm_buffer *shm);
-/**
- * Prepares a matrix with the appropriate scale for the given texture and
- * multiplies it with the projection, producing a matrix that the shader can
- * muptlipy vertex coordinates with to get final screen coordinates.
- *
- * The projection matrix is assumed to be an orthographic projection of [0,
- * width) and [0, height], and the x and y coordinates provided are used as
- * such.
- */
-void wlr_texture_get_matrix(struct wlr_texture *texture, float mat[static 9],
-		const float projection[static 9], int x, int y);
+	int x, int y, int width, int height, struct wl_shm_buffer *shm);
 /**
  * Destroys this wlr_texture.
  */
diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h
index c8b4c8eb..1b8b7946 100644
--- a/include/wlr/render/interface.h
+++ b/include/wlr/render/interface.h
@@ -62,8 +62,6 @@ struct wlr_texture_impl {
 		uint32_t width, uint32_t height);
 	bool (*upload_dmabuf)(struct wlr_texture *texture,
 		struct wl_resource *dmabuf_resource);
-	void (*get_matrix)(struct wlr_texture *state, float mat[static 9],
-		const float projection[static 9], int x, int y);
 	void (*get_buffer_size)(struct wlr_texture *texture,
 		struct wl_resource *resource, int *width, int *height);
 	void (*bind)(struct wlr_texture *texture);
-- 
cgit v1.2.3