mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-11-24 06:59:45 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

surface: remove wlr_surface.texture

Browse source 
The texture is managed by the surface's wlr_buffer now. In
particular, the buffer can destroy the texture early if it becomes
invalid.
This commit is contained in:
emersion 2018-06-13 19:38:10 +01:00
parent d643361c48
commit 0378d143d9
No known key found for this signature in database
GPG key ID: 0FDE7BE0E88F5E48
5 changed files with 38 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
include/wlr/types/wlr_buffer.h
View file

@ -8,8 +8,15 @@
* A client buffer.
*/
struct wlr_buffer {
struct wl_resource *resource; // can be NULL
struct wlr_texture *texture; // can be NULL
/**
* The buffer resource, if any. Will be NULL if the client destroys it.
*/
struct wl_resource *resource;
/**
* The buffer's texture, if any. A buffer will not have a texture if the
* client destroys the buffer before it has been released.
*/
struct wlr_texture *texture;
bool released;
size_t n_refs;

14
include/wlr/types/wlr_surface.h
View file

@ -69,8 +69,13 @@ struct wlr_subsurface {
struct wlr_surface {
struct wl_resource *resource;
struct wlr_renderer *renderer;
/**
* The surface's buffer, if any. A surface has an attached buffer when it
* commits with a non-null buffer in its pending state. A surface will not
* have a buffer if it has never committed one, has committed a null buffer,
* or something went wrong with uploading the buffer.
*/
struct wlr_buffer *buffer;
struct wlr_texture *texture;
struct wlr_surface_state *current, *pending;
const char *role; // the lifetime-bound role or null
@ -125,6 +130,13 @@ int wlr_surface_set_role(struct wlr_surface *surface, const char *role,
*/
bool wlr_surface_has_buffer(struct wlr_surface *surface);
/**
* Get the texture of the buffer currently attached to this surface. Returns
* NULL if no buffer is currently attached or if something went wrong with
* uploading the buffer.
*/
struct wlr_texture *wlr_surface_get_texture(struct wlr_surface *surface);
/**
* Create a new subsurface resource with the provided new ID. If `resource_list`
* is non-NULL, adds the subsurface's resource to the list.