aboutsummaryrefslogtreecommitdiff
path: root/include/wlr
diff options
context:
space:
mode:
Diffstat (limited to 'include/wlr')
-rw-r--r--include/wlr/render.h48
-rw-r--r--include/wlr/render/interface.h20
-rw-r--r--include/wlr/render/matrix.h2
-rw-r--r--include/wlr/types/wlr_output.h2
4 files changed, 36 insertions, 36 deletions
diff --git a/include/wlr/render.h b/include/wlr/render.h
index 4de2432d..3dcc482c 100644
--- a/include/wlr/render.h
+++ b/include/wlr/render.h
@@ -4,30 +4,30 @@
#include <wayland-server-protocol.h>
#include <wlr/types/wlr_output.h>
-struct wlr_surface;
+struct wlr_texture;
struct wlr_renderer;
void wlr_renderer_begin(struct wlr_renderer *r, struct wlr_output *output);
void wlr_renderer_end(struct wlr_renderer *r);
/**
- * Requests a surface handle from this renderer.
+ * Requests a texture handle from this renderer.
*/
-struct wlr_surface *wlr_render_surface_init(struct wlr_renderer *r);
+struct wlr_texture *wlr_render_texture_init(struct wlr_renderer *r);
/**
- * Renders the requested surface using the provided matrix. A typical surface
+ * Renders the requested texture using the provided matrix. A typical texture
* rendering goes like so:
*
* struct wlr_renderer *renderer;
- * struct wlr_surface *surface;
+ * struct wlr_texture *texture;
* float projection[16];
* float matrix[16];
- * wlr_surface_get_matrix(surface, &matrix, &projection, 123, 321);
- * wlr_render_with_matrix(renderer, surface, &matrix);
+ * wlr_texture_get_matrix(texture, &matrix, &projection, 123, 321);
+ * wlr_render_with_matrix(renderer, texture, &matrix);
*
- * This will render the surface at <123, 321>.
+ * This will render the texture at <123, 321>.
*/
bool wlr_render_with_matrix(struct wlr_renderer *r,
- struct wlr_surface *surface, const float (*matrix)[16]);
+ struct wlr_texture *texture, const float (*matrix)[16]);
/**
* Renders a solid quad in the specified color.
*/
@@ -44,16 +44,16 @@ void wlr_render_colored_ellipse(struct wlr_renderer *r,
const enum wl_shm_format *wlr_renderer_get_formats(
struct wlr_renderer *r, size_t *len);
/**
- * Destroys this wlr_renderer. Surfaces must be destroyed separately.
+ * Destroys this wlr_renderer. Textures must be destroyed separately.
*/
void wlr_renderer_destroy(struct wlr_renderer *renderer);
-struct wlr_surface_impl;
-struct wlr_surface_state;
+struct wlr_texture_impl;
+struct wlr_texture_state;
-struct wlr_surface {
- struct wlr_surface_impl *impl;
- struct wlr_surface_state *state;
+struct wlr_texture {
+ struct wlr_texture_impl *impl;
+ struct wlr_texture_state *state;
bool valid;
uint32_t format;
int width, height;
@@ -62,32 +62,32 @@ struct wlr_surface {
};
/**
- * Attaches a pixel buffer to this surface. The buffer may be discarded after
+ * Uploads a pixel buffer to this texture. The buffer may be discarded after
* calling this function.
*/
-bool wlr_surface_attach_pixels(struct wlr_surface *surf,
+bool wlr_texture_upload_pixels(struct wlr_texture *surf,
enum wl_shm_format format, int stride, int width, int height,
const unsigned char *pixels);
/**
- * Attaches pixels from a wl_shm_buffer to this surface. The shm buffer may be
+ * Uploads pixels from a wl_shm_buffer to this texture. The shm buffer may be
* invalidated after calling this function.
*/
-bool wlr_surface_attach_shm(struct wlr_surface *surf, uint32_t format,
+bool wlr_texture_upload_shm(struct wlr_texture *surf, uint32_t format,
struct wl_shm_buffer *shm);
/**
- * Prepares a matrix with the appropriate scale for the given surface and
+ * 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_surface_get_matrix(struct wlr_surface *surface,
+void wlr_texture_get_matrix(struct wlr_texture *texture,
float (*matrix)[16], const float (*projection)[16], int x, int y);
/**
- * Destroys this wlr_surface.
+ * Destroys this wlr_texture.
*/
-void wlr_surface_destroy(struct wlr_surface *tex);
+void wlr_texture_destroy(struct wlr_texture *texture);
#endif
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
diff --git a/include/wlr/render/matrix.h b/include/wlr/render/matrix.h
index be6a947d..789f7341 100644
--- a/include/wlr/render/matrix.h
+++ b/include/wlr/render/matrix.h
@@ -10,7 +10,7 @@ void wlr_matrix_rotate(float (*output)[16], float radians);
void wlr_matrix_mul(const float (*x)[16], const float (*y)[16], float (*product)[16]);
enum wl_output_transform;
-void wlr_matrix_surface(float mat[static 16], int32_t width, int32_t height,
+void wlr_matrix_texture(float mat[static 16], int32_t width, int32_t height,
enum wl_output_transform transform);
#endif
diff --git a/include/wlr/types/wlr_output.h b/include/wlr/types/wlr_output.h
index cfc4cc0e..02c336e7 100644
--- a/include/wlr/types/wlr_output.h
+++ b/include/wlr/types/wlr_output.h
@@ -49,7 +49,7 @@ struct wlr_output {
int32_t x, y;
uint32_t width, height;
struct wlr_renderer *renderer;
- struct wlr_surface *texture;
+ struct wlr_texture *texture;
} cursor;
};