Merge pull request #48 from nyorain/wlr_texture

Rename wlr_surface -> wlr_texture; attach -> upload

1 files changed, 10 insertions, 10 deletions

diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h
index ed804bb4..83e34625 100644
--- a/include/wlr/render/interface.h
+++ b/include/wlr/render/interface.h
@@ -16,9 +16,9 @@ struct wlr_renderer {
 struct wlr_renderer_impl {
 	void (*begin)(struct wlr_renderer_state *state, struct wlr_output *output);
 	void (*end)(struct wlr_renderer_state *state);
-	struct wlr_surface *(*surface_init)(struct wlr_renderer_state *state);
+	struct wlr_texture *(*texture_init)(struct wlr_renderer_state *state);
 	bool (*render_with_matrix)(struct wlr_renderer_state *state,
-		struct wlr_surface *surface, const float (*matrix)[16]);
+		struct wlr_texture *texture, const float (*matrix)[16]);
 	void (*render_quad)(struct wlr_renderer_state *state,
 		const float (*color)[4], const float (*matrix)[16]);
 	void (*render_ellipse)(struct wlr_renderer_state *state,
@@ -31,20 +31,20 @@ struct wlr_renderer_impl {
 struct wlr_renderer *wlr_renderer_init(struct wlr_renderer_state *state,
 		struct wlr_renderer_impl *impl);
 
-struct wlr_surface_impl {
-	bool (*attach_pixels)(struct wlr_surface_state *state,
+struct wlr_texture_impl {
+	bool (*upload_pixels)(struct wlr_texture_state *state,
 		enum wl_shm_format format, int stride, int width, int height,
 		const unsigned char *pixels);
-	bool (*attach_shm)(struct wlr_surface_state *state, uint32_t format,
+	bool (*upload_shm)(struct wlr_texture_state *state, uint32_t format,
 		struct wl_shm_buffer *shm);
 	// TODO: egl
-	void (*get_matrix)(struct wlr_surface_state *state,
+	void (*get_matrix)(struct wlr_texture_state *state,
 		float (*matrix)[16], const float (*projection)[16], int x, int y);
-	void (*bind)(struct wlr_surface_state *state);
-	void (*destroy)(struct wlr_surface_state *state);
+	void (*bind)(struct wlr_texture_state *state);
+	void (*destroy)(struct wlr_texture_state *state);
 };
 
-struct wlr_surface *wlr_surface_init();
-void wlr_surface_bind(struct wlr_surface *surface);
+struct wlr_texture *wlr_texture_init();
+void wlr_texture_bind(struct wlr_texture *texture);
 
 #endif