diff options
Diffstat (limited to 'include/wlr')
| -rw-r--r-- | include/wlr/render.h | 13 | ||||
| -rw-r--r-- | include/wlr/render/gles2.h | 1 | ||||
| -rw-r--r-- | include/wlr/render/interface.h | 3 | ||||
| -rw-r--r-- | include/wlr/types/wlr_surface.h | 4 |
4 files changed, 17 insertions, 4 deletions
diff --git a/include/wlr/render.h b/include/wlr/render.h index 61169333..47e2ff57 100644 --- a/include/wlr/render.h +++ b/include/wlr/render.h @@ -65,7 +65,7 @@ struct wlr_texture { * Copies pixels to this texture. The buffer is not accessed after this function * returns. */ -bool wlr_texture_upload_pixels(struct wlr_texture *surf, +bool wlr_texture_upload_pixels(struct wlr_texture *tex, enum wl_shm_format format, int stride, int width, int height, const unsigned char *pixels); /** @@ -80,8 +80,17 @@ bool wlr_texture_update_pixels(struct wlr_texture *surf, * 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 *surf, uint32_t format, +bool wlr_texture_upload_shm(struct wlr_texture *tex, uint32_t format, struct wl_shm_buffer *shm); + +/** + * Attaches the contents from the given wl_drm wl_buffer resource onto the + * texture. The wl_resource is not used after this call. + * Will fail (return false) if the given resource is no drm buffer. + */ + bool wlr_texture_upload_drm(struct wlr_texture *tex, + struct wl_resource *drm_buffer); + /** * Copies a rectangle of pixels from a wl_shm_buffer onto the texture. The * buffer is not accessed after this function returns. Under some circumstances, diff --git a/include/wlr/render/gles2.h b/include/wlr/render/gles2.h index a779ffff..43d4719e 100644 --- a/include/wlr/render/gles2.h +++ b/include/wlr/render/gles2.h @@ -2,6 +2,7 @@ #define _WLR_GLES2_RENDERER_H #include <wlr/render.h> +struct wlr_egl; struct wlr_renderer *wlr_gles2_renderer_init(); #endif diff --git a/include/wlr/render/interface.h b/include/wlr/render/interface.h index be9ffe7a..4a4b22e2 100644 --- a/include/wlr/render/interface.h +++ b/include/wlr/render/interface.h @@ -42,7 +42,8 @@ struct wlr_texture_impl { struct wl_shm_buffer *shm); bool (*update_shm)(struct wlr_texture_state *surf, uint32_t format, int x, int y, int width, int height, struct wl_shm_buffer *shm); - // TODO: egl + bool (*upload_drm)(struct wlr_texture_state *state, + struct wl_resource *drm_buf); void (*get_matrix)(struct wlr_texture_state *state, float (*matrix)[16], const float (*projection)[16], int x, int y); void (*bind)(struct wlr_texture_state *state); diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h index e8e747cd..c9cbeba6 100644 --- a/include/wlr/types/wlr_surface.h +++ b/include/wlr/types/wlr_surface.h @@ -37,11 +37,13 @@ struct wlr_surface { float surface_to_buffer_matrix[16]; struct { - struct wl_signal destroy; struct wl_signal commit; } signals; struct wl_list frame_callback_list; // wl_surface.frame + + struct wl_listener compositor_listener; // destroy listener used by compositor + void *compositor_data; }; struct wlr_renderer; |