render/egl: allow passing NULL to surface and image destructors

2 files changed, 10 insertions, 9 deletions

diff --git a/render/egl.c b/render/egl.c
index 74ac17fd..95bdef55 100644
--- a/render/egl.c
+++ b/render/egl.c
@@ -225,9 +225,10 @@ bool wlr_egl_destroy_image(struct wlr_egl *egl, EGLImage image) {
 	if (!eglDestroyImageKHR) {
 		return false;
 	}
-
-	eglDestroyImageKHR(egl->display, image);
-	return true;
+	if (!image) {
+		return true;
+	}
+	return eglDestroyImageKHR(egl->display, image);
 }
 
 EGLSurface wlr_egl_create_surface(struct wlr_egl *egl, void *window) {
@@ -500,6 +501,9 @@ int wlr_egl_get_dmabuf_modifiers(struct wlr_egl *egl,
 	return num;
 }
 
-void wlr_egl_destroy_surface(struct wlr_egl *egl, EGLSurface surface) {
-	eglDestroySurface(egl->display, surface);
+bool wlr_egl_destroy_surface(struct wlr_egl *egl, EGLSurface surface) {
+	if (!surface) {
+		return true;
+	}
+	return eglDestroySurface(egl->display, surface);
 }
diff --git a/render/gles2/texture.c b/render/gles2/texture.c
index 45169daf..45425fbf 100644
--- a/render/gles2/texture.c
+++ b/render/gles2/texture.c
@@ -88,10 +88,7 @@ static void gles2_texture_destroy(struct wlr_texture *wlr_texture) {
 	if (texture->image_tex) {
 		glDeleteTextures(1, &texture->image_tex);
 	}
-	if (texture->image) {
-		assert(eglDestroyImageKHR);
-		wlr_egl_destroy_image(texture->egl, texture->image);
-	}
+	wlr_egl_destroy_image(texture->egl, texture->image);
 
 	if (texture->type == WLR_GLES2_TEXTURE_GLTEX) {
 		glDeleteTextures(1, &texture->gl_tex);