diff options
| author | emersion <contact@emersion.fr> | 2018-04-25 00:42:19 +0100 |
|---|---|---|
| committer | emersion <contact@emersion.fr> | 2018-04-25 08:28:48 +0100 |
| commit | 018b82c01e642aae45dace95c5aae5d489e98853 (patch) | |
| tree | 240bcac75264906411ef9f454dced46f71702649 /backend | |
| parent | eaed6bd03b14e6f124723ce4da56011a80411886 (diff) | |
render/egl: allow passing NULL to surface and image destructors
Diffstat (limited to 'backend')
| -rw-r--r-- | backend/drm/renderer.c | 8 | ||||
| -rw-r--r-- | backend/headless/output.c | 4 |
2 files changed, 3 insertions, 9 deletions
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) { |