mirrors/wlroots
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/wlroots/wlroots.git synced 2025-10-31 22:25:21 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

impl->destroy cleanup:

Browse source 
- remove trivial destroy() function
 - make sure we check impl and impl->destroy before calling
 - always call free if not implemented
This commit is contained in:
Dominique Martinet 2017-08-14 16:16:20 +02:00
parent ba20d5b3ca
commit 4bbf718e7d
6 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

5
render/gles2/renderer.c
View file

@ -227,10 +227,6 @@ static bool wlr_gles2_buffer_is_drm(struct wlr_renderer *_renderer,
EGL_TEXTURE_FORMAT, &format);
}
static void wlr_gles2_destroy(struct wlr_renderer *renderer) {
free(renderer);
}
static struct wlr_renderer_impl wlr_renderer_impl = {
.begin = wlr_gles2_begin,
.end = wlr_gles2_end,
@ -240,7 +236,6 @@ static struct wlr_renderer_impl wlr_renderer_impl = {
.render_ellipse = wlr_gles2_render_ellipse,
.formats = wlr_gles2_formats,
.buffer_is_drm = wlr_gles2_buffer_is_drm,
.destroy = wlr_gles2_destroy
};
struct wlr_renderer *wlr_gles2_renderer_init(struct wlr_backend *backend) {

4
render/wlr_renderer.c
View file

@ -8,8 +8,10 @@ void wlr_renderer_init(struct wlr_renderer *renderer,
}
void wlr_renderer_destroy(struct wlr_renderer *r) {
if (r && r->impl->destroy) {
if (r && r->impl && r->impl->destroy) {
r->impl->destroy(r);
} else {
free(r);
}
}

4
render/wlr_texture.c
View file

@ -9,8 +9,10 @@ void wlr_texture_init(struct wlr_texture *texture,
}
void wlr_texture_destroy(struct wlr_texture *texture) {
if (texture && texture->impl->destroy) {
if (texture && texture->impl && texture->impl->destroy) {
texture->impl->destroy(texture);
} else {
free(texture);
}
}