Merge branch 'master' into drm_buffer

This commit is contained in:
Drew DeVault 2017-08-10 13:19:39 -04:00
commit 7095274a9e
8 changed files with 80 additions and 24 deletions

View file

@ -5,6 +5,7 @@ struct wl_resource;
// Implements the given resource as region.
// Sets the associated pixman_region32_t as userdata.
void wlr_region_create(struct wl_resource *res);
void wlr_region_create(struct wl_client *client, struct wl_resource *res,
uint32_t id);
#endif

View file

@ -48,6 +48,7 @@ struct wlr_surface {
struct wlr_renderer;
struct wlr_surface *wlr_surface_create(struct wl_resource *res,
struct wlr_renderer *renderer);
struct wlr_renderer *renderer);
void wlr_surface_flush_damage(struct wlr_surface *surface);
#endif