diff options
author | Drew DeVault <sir@cmpwn.com> | 2018-06-13 19:57:42 -0400 |
---|---|---|
committer | Drew DeVault <sir@cmpwn.com> | 2018-06-13 19:57:42 -0400 |
commit | d27eeaa14c9a35c709f09de862aa6d4f0ef9ff83 (patch) | |
tree | 8d07938ec66f971d42d019cb9c7e694d5757c1cd /include/wlr | |
parent | d643361c48231305b8d8a4d93772d1e2c14382a7 (diff) |
Revert "Merge pull request #1050 from emersion/wlr-buffer"
This reverts commit 5e4af4862e7247528eda0891c11daa1d86786c86, reversing
changes made to 9a1f0e2d5fe56870f3bd7d12113742766e89f4e6.
Diffstat (limited to 'include/wlr')
-rw-r--r-- | include/wlr/types/wlr_buffer.h | 56 | ||||
-rw-r--r-- | include/wlr/types/wlr_surface.h | 1 |
2 files changed, 0 insertions, 57 deletions
diff --git a/include/wlr/types/wlr_buffer.h b/include/wlr/types/wlr_buffer.h deleted file mode 100644 index fc348a1c..00000000 --- a/include/wlr/types/wlr_buffer.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef WLR_TYPES_WLR_BUFFER_H -#define WLR_TYPES_WLR_BUFFER_H - -#include <pixman.h> -#include <wayland-server.h> - -/** - * A client buffer. - */ -struct wlr_buffer { - struct wl_resource *resource; // can be NULL - struct wlr_texture *texture; // can be NULL - bool released; - size_t n_refs; - - struct wl_listener resource_destroy; -}; - -struct wlr_renderer; - -/** - * Check if a resource is a wl_buffer resource. - */ -bool wlr_resource_is_buffer(struct wl_resource *resource); -/** - * Get the size of a wl_buffer resource. - */ -bool wlr_buffer_get_resource_size(struct wl_resource *resource, - struct wlr_renderer *renderer, int *width, int *height); - -/** - * Upload a buffer to the GPU and reference it. - */ -struct wlr_buffer *wlr_buffer_create(struct wlr_renderer *renderer, - struct wl_resource *resource); -/** - * Reference the buffer. - */ -struct wlr_buffer *wlr_buffer_ref(struct wlr_buffer *buffer); -/** - * Unreference the buffer. After this call, `buffer` may not be accessed - * anymore. - */ -void wlr_buffer_unref(struct wlr_buffer *buffer); -/** - * Try to update the buffer's content. On success, returns the updated buffer - * and destroys the provided `buffer`. On error, `buffer` is intact and NULL is - * returned. - * - * Fails if there's more than one reference to the buffer or if the texture - * isn't mutable. - */ -struct wlr_buffer *wlr_buffer_apply_damage(struct wlr_buffer *buffer, - struct wl_resource *resource, pixman_region32_t *damage); - -#endif diff --git a/include/wlr/types/wlr_surface.h b/include/wlr/types/wlr_surface.h index 64503e78..526e4e2c 100644 --- a/include/wlr/types/wlr_surface.h +++ b/include/wlr/types/wlr_surface.h @@ -69,7 +69,6 @@ struct wlr_subsurface { struct wlr_surface { struct wl_resource *resource; struct wlr_renderer *renderer; - struct wlr_buffer *buffer; struct wlr_texture *texture; struct wlr_surface_state *current, *pending; const char *role; // the lifetime-bound role or null |