summaryrefslogtreecommitdiff
path: root/src/egl
diff options
context:
space:
mode:
authorLucas Stach <l.stach@pengutronix.de>2022-01-03 19:57:14 +0100
committerMarge Bot <emma+marge@anholt.net>2022-01-17 10:32:01 +0000
commit0d65f229c5c3a0eb2cc7da742ee0aca1e5c72fc7 (patch)
tree6035a676a01717a7ad0e776035752f5bc5f83bed /src/egl
parentb33ed5406a9379dba98e2ae1b8ff47fa22e8cb6a (diff)
egl/dri2: short-circuit dri2_make_current when possible
If an application calls eglMakeCurrent with the same context and the same draw and read surfaces as the current ones, there is no need to go through all the work of unbinding/flushing the old context and binding the new one. While the EGL spec is a bit ambiguous here, it seems that the implicit flush of the outgoing context only needs to be done when the context is actually changed. Signed-off-by: Lucas Stach <l.stach@pengutronix.de> Reviewed-by: Adam Jackson <ajax@redhat.com> Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/14379>
Diffstat (limited to 'src/egl')
-rw-r--r--src/egl/drivers/dri2/egl_dri2.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/egl/drivers/dri2/egl_dri2.c b/src/egl/drivers/dri2/egl_dri2.c
index 93030adc1e9..93e3af618f9 100644
--- a/src/egl/drivers/dri2/egl_dri2.c
+++ b/src/egl/drivers/dri2/egl_dri2.c
@@ -1783,6 +1783,13 @@ dri2_make_current(_EGLDisplay *disp, _EGLSurface *dsurf,
if (!_eglBindContext(ctx, dsurf, rsurf, &old_ctx, &old_dsurf, &old_rsurf))
return EGL_FALSE;
+ if (old_ctx == ctx && old_dsurf == dsurf && old_rsurf == rsurf) {
+ _eglPutSurface(old_dsurf);
+ _eglPutSurface(old_rsurf);
+ _eglPutContext(old_ctx);
+ return EGL_TRUE;
+ }
+
if (old_ctx) {
__DRIcontext *old_cctx = dri2_egl_context(old_ctx)->dri_context;
old_disp = old_ctx->Resource.Display;