diff options
Diffstat (limited to 'include')
| -rw-r--r-- | include/render/gles2.h | 1 | ||||
| -rw-r--r-- | include/wlr/render/interface.h | 6 | ||||
| -rw-r--r-- | include/wlr/render/wlr_texture.h | 4 | 
3 files changed, 7 insertions, 4 deletions
| diff --git a/include/render/gles2.h b/include/render/gles2.h index f649f3e2..04a73e27 100644 --- a/include/render/gles2.h +++ b/include/render/gles2.h @@ -72,6 +72,7 @@ struct wlr_gles2_texture {  	enum wlr_gles2_texture_type type;  	int width, height;  	bool has_alpha; +	uint32_t wl_format; // used to interpret upload data  	bool inverted_y;  	// Not set if WLR_GLES2_TEXTURE_GLTEX diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index 63f4265c..905d419f 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -66,9 +66,9 @@ 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, -		enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width, -		uint32_t height, uint32_t src_x, uint32_t src_y, uint32_t dst_x, -		uint32_t dst_y, const void *data); +		uint32_t stride, uint32_t width, uint32_t height, +		uint32_t src_x, uint32_t src_y, uint32_t dst_x, uint32_t dst_y, +		const void *data);  	bool (*to_dmabuf)(struct wlr_texture *texture,  		struct wlr_dmabuf_attributes *attribs);  	void (*destroy)(struct wlr_texture *texture); diff --git a/include/wlr/render/wlr_texture.h b/include/wlr/render/wlr_texture.h index dbfabfee..2eb5d6aa 100644 --- a/include/wlr/render/wlr_texture.h +++ b/include/wlr/render/wlr_texture.h @@ -55,9 +55,11 @@ bool wlr_texture_is_opaque(struct wlr_texture *texture);  /**   * Update a texture with raw pixels. The texture must be mutable. + * The given data is interpreted as being in the format the + * texture was created with.   */  bool wlr_texture_write_pixels(struct wlr_texture *texture, -	enum wl_shm_format wl_fmt, uint32_t stride, uint32_t width, uint32_t height, +	uint32_t stride, uint32_t width, uint32_t height,  	uint32_t src_x, uint32_t src_y, uint32_t dst_x, uint32_t dst_y,  	const void *data); | 
