From 018b82c01e642aae45dace95c5aae5d489e98853 Mon Sep 17 00:00:00 2001
From: emersion <contact@emersion.fr>
Date: Wed, 25 Apr 2018 00:42:19 +0100
Subject: render/egl: allow passing NULL to surface and image destructors
---
backend/drm/renderer.c | 8 ++------
backend/headless/output.c | 4 +---
2 files changed, 3 insertions(+), 9 deletions(-)
(limited to 'backend')
diff --git a/backend/drm/renderer.c b/backend/drm/renderer.c
index 208d50fa..ea46a5e9 100644
--- a/backend/drm/renderer.c
+++ b/backend/drm/renderer.c
@@ -79,9 +79,7 @@ bool wlr_drm_surface_init(struct wlr_drm_surface *surf,
}
gbm_surface_destroy(surf->gbm);
}
- if (surf->egl) {
- wlr_egl_destroy_surface(&surf->renderer->egl, surf->egl);
- }
+ wlr_egl_destroy_surface(&surf->renderer->egl, surf->egl);
surf->gbm = gbm_surface_create(renderer->gbm, width, height,
format, GBM_BO_USE_RENDERING | flags);
@@ -117,9 +115,7 @@ void wlr_drm_surface_finish(struct wlr_drm_surface *surf) {
gbm_surface_release_buffer(surf->gbm, surf->back);
}
- if (surf->egl) {
- wlr_egl_destroy_surface(&surf->renderer->egl, surf->egl);
- }
+ wlr_egl_destroy_surface(&surf->renderer->egl, surf->egl);
if (surf->gbm) {
gbm_surface_destroy(surf->gbm);
}
diff --git a/backend/headless/output.c b/backend/headless/output.c
index 4b748dbf..f71b4cdb 100644
--- a/backend/headless/output.c
+++ b/backend/headless/output.c
@@ -29,9 +29,7 @@ static bool output_set_custom_mode(struct wlr_output *wlr_output, int32_t width,
refresh = HEADLESS_DEFAULT_REFRESH;
}
- if (output->egl_surface) {
- wlr_egl_destroy_surface(&backend->egl, output->egl_surface);
- }
+ wlr_egl_destroy_surface(&backend->egl, output->egl_surface);
output->egl_surface = egl_create_surface(&backend->egl, width, height);
if (output->egl_surface == EGL_NO_SURFACE) {
--
cgit v1.2.3