diff options
| -rw-r--r-- | include/wlr/types/wlr_buffer.h | 2 | ||||
| -rw-r--r-- | types/wlr_buffer.c | 4 | ||||
| -rw-r--r-- | types/wlr_surface.c | 2 |
3 files changed, 3 insertions, 5 deletions
diff --git a/include/wlr/types/wlr_buffer.h b/include/wlr/types/wlr_buffer.h index 041bcb3b..046cd392 100644 --- a/include/wlr/types/wlr_buffer.h +++ b/include/wlr/types/wlr_buffer.h @@ -150,7 +150,7 @@ struct wlr_client_buffer { * from it, and copying its wl_resource. */ struct wlr_client_buffer *wlr_client_buffer_create(struct wlr_buffer *buffer, - struct wlr_renderer *renderer, struct wl_resource *resource); + struct wlr_renderer *renderer); /** * Get a client buffer from a generic buffer. If the buffer isn't a client diff --git a/types/wlr_buffer.c b/types/wlr_buffer.c index 309651a8..f32fd928 100644 --- a/types/wlr_buffer.c +++ b/types/wlr_buffer.c @@ -190,11 +190,10 @@ struct wlr_buffer *wlr_buffer_from_resource(struct wlr_renderer *renderer, } struct wlr_client_buffer *wlr_client_buffer_create(struct wlr_buffer *buffer, - struct wlr_renderer *renderer, struct wl_resource *resource) { + struct wlr_renderer *renderer) { struct wlr_texture *texture = wlr_texture_from_buffer(renderer, buffer); if (texture == NULL) { wlr_log(WLR_ERROR, "Failed to create texture"); - wl_buffer_send_release(resource); return NULL; } @@ -202,7 +201,6 @@ struct wlr_client_buffer *wlr_client_buffer_create(struct wlr_buffer *buffer, calloc(1, sizeof(struct wlr_client_buffer)); if (client_buffer == NULL) { wlr_texture_destroy(texture); - wl_resource_post_no_memory(resource); return NULL; } wlr_buffer_init(&client_buffer->base, &client_buffer_impl, diff --git a/types/wlr_surface.c b/types/wlr_surface.c index 70a8dcaf..43e26c13 100644 --- a/types/wlr_surface.c +++ b/types/wlr_surface.c @@ -383,7 +383,7 @@ static void surface_apply_damage(struct wlr_surface *surface) { } struct wlr_client_buffer *buffer = wlr_client_buffer_create( - surface->current.buffer, surface->renderer, resource); + surface->current.buffer, surface->renderer); wlr_buffer_unlock(surface->current.buffer); surface->current.buffer = NULL; |