From c31d307971da6088c76fca9a057a6426cc59df22 Mon Sep 17 00:00:00 2001 From: Simon Ser Date: Thu, 22 Feb 2024 19:37:54 +0100 Subject: [PATCH] render/egl: drop wlr_egl_save_context() This is no longer used. --- include/render/egl.h | 7 ------- render/egl.c | 12 ++++-------- 2 files changed, 4 insertions(+), 15 deletions(-) diff --git a/include/render/egl.h b/include/render/egl.h index 3467ac593..89b61f0f3 100644 --- a/include/render/egl.h +++ b/include/render/egl.h @@ -90,13 +90,6 @@ bool wlr_egl_destroy_image(struct wlr_egl *egl, EGLImageKHR image); int wlr_egl_dup_drm_fd(struct wlr_egl *egl); -/** - * Save the current EGL context to the structure provided in the argument. - * - * This includes display, context, draw surface and read surface. - */ -void wlr_egl_save_context(struct wlr_egl_context *context); - /** * Restore EGL context that was previously saved using wlr_egl_save_current(). */ diff --git a/render/egl.c b/render/egl.c index e8b13ce80..d2e0af9a2 100644 --- a/render/egl.c +++ b/render/egl.c @@ -652,7 +652,10 @@ bool wlr_egl_destroy_image(struct wlr_egl *egl, EGLImage image) { bool wlr_egl_make_current(struct wlr_egl *egl, struct wlr_egl_context *save_context) { if (save_context != NULL) { - wlr_egl_save_context(save_context); + save_context->display = eglGetCurrentDisplay(); + save_context->context = eglGetCurrentContext(); + save_context->draw_surface = eglGetCurrentSurface(EGL_DRAW); + save_context->read_surface = eglGetCurrentSurface(EGL_READ); } if (!eglMakeCurrent(egl->display, EGL_NO_SURFACE, EGL_NO_SURFACE, egl->context)) { @@ -675,13 +678,6 @@ bool wlr_egl_is_current(struct wlr_egl *egl) { return eglGetCurrentContext() == egl->context; } -void wlr_egl_save_context(struct wlr_egl_context *context) { - context->display = eglGetCurrentDisplay(); - context->context = eglGetCurrentContext(); - context->draw_surface = eglGetCurrentSurface(EGL_DRAW); - context->read_surface = eglGetCurrentSurface(EGL_READ); -} - bool wlr_egl_restore_context(struct wlr_egl_context *context) { // If the saved context is a null-context, we must use the current // display instead of the saved display because eglMakeCurrent() can't