blankie
/
wlroots
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

surface: remove resource_list arg from surface_create 

This is never used.
This commit is contained in:
Simon Ser 2021-03-30 10:19:29 +02:00
parent c430cd7d53
commit a9e5df44d8
3 changed files with 3 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/types/wlr_surface.h
View File

@ -6,8 +6,7 @@
struct wlr_renderer; struct wlr_renderer;
/** /**
* Create a new surface resource with the provided new ID. If `resource_list` * Create a new surface resource with the provided new ID.
* is non-NULL, adds the surface's resource to the list.
*/ */
struct wlr_surface *surface_create(struct wl_client *client, struct wlr_surface *surface_create(struct wl_client *client,
uint32_t version, uint32_t id, struct wlr_renderer *renderer); uint32_t version, uint32_t id, struct wlr_renderer *renderer);

2
types/wlr_compositor.c
View File

@ -121,7 +121,7 @@ static void compositor_create_surface(struct wl_client *client,
struct wlr_compositor *compositor = compositor_from_resource(resource); struct wlr_compositor *compositor = compositor_from_resource(resource);
struct wlr_surface *surface = surface_create(client, struct wlr_surface *surface = surface_create(client,
wl_resource_get_version(resource), id, compositor->renderer, NULL); wl_resource_get_version(resource), id, compositor->renderer);
if (surface == NULL) { if (surface == NULL) {
wl_client_post_no_memory(client); wl_client_post_no_memory(client);
return; return;

12
types/wlr_surface.c
View File

@ -676,8 +676,6 @@ static void surface_handle_resource_destroy(struct wl_resource *resource) {
wlr_signal_emit_safe(&surface->events.destroy, surface); wlr_signal_emit_safe(&surface->events.destroy, surface);
wl_list_remove(wl_resource_get_link(surface->resource));
struct wlr_surface_state *cached, *cached_tmp; struct wlr_surface_state *cached, *cached_tmp;
wl_list_for_each_safe(cached, cached_tmp, &surface->cached, cached_state_link) { wl_list_for_each_safe(cached, cached_tmp, &surface->cached, cached_state_link) {
surface_state_destroy_cached(cached); surface_state_destroy_cached(cached);
@ -704,8 +702,7 @@ static void surface_handle_renderer_destroy(struct wl_listener *listener,
} }
struct wlr_surface *surface_create(struct wl_client *client, struct wlr_surface *surface_create(struct wl_client *client,
uint32_t version, uint32_t id, struct wlr_renderer *renderer, uint32_t version, uint32_t id, struct wlr_renderer *renderer) {
struct wl_list *resource_list) {
assert(version <= SURFACE_VERSION); assert(version <= SURFACE_VERSION);
struct wlr_surface *surface = calloc(1, sizeof(struct wlr_surface)); struct wlr_surface *surface = calloc(1, sizeof(struct wlr_surface));
@ -746,13 +743,6 @@ struct wlr_surface *surface_create(struct wl_client *client,
wl_signal_add(&renderer->events.destroy, &surface->renderer_destroy); wl_signal_add(&renderer->events.destroy, &surface->renderer_destroy);
surface->renderer_destroy.notify = surface_handle_renderer_destroy; surface->renderer_destroy.notify = surface_handle_renderer_destroy;
struct wl_list *resource_link = wl_resource_get_link(surface->resource);
if (resource_list != NULL) {
wl_list_insert(resource_list, resource_link);
} else {
wl_list_init(resource_link);
}
return surface; return surface;
} }