Remove fmt parameter from wlr_texture_write_pixels

It's not allowed to change the format of a texture so remove
the confusing parameter.
This commit is contained in:
nyorain 2018-10-15 23:56:56 +02:00
parent 8beeb88309
commit cd28637187
6 changed files with 32 additions and 20 deletions

View file

@ -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

View file

@ -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);

View file

@ -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);