egl/dri2: only take a dri2_dpy reference when binding a new context/surfaces
This effectively reverts part of2907faee
, which changed dri2_make_current() to always take a dri2_dpy reference regardless of whether or not a new context or surface(s) were being bound. This led to a reference count imbalance as there was no corresponding code added to drop a reference on the dri2_dpy. As a consequence, any application that called eglInitialize() on a default/native display after having called eglTerminate() would always get back the old dri2_dpy, inheriting its previous state. As the reference count is there to prevent the dri2_dpy from being destroyed between eglTerminate() and eglInitialize() calls when a context is still bound, a reference should only be taken when a successful call to dri2_dpy->core->bindContext() has been made. Fix the issue by restoring the old reference counting behaviour. Fixes:4e8f95f64d
("egl_dri2: Always unbind old contexts") Fixes:2907faee7a
("egl/dri2: try to bind old context if bindContext failed") Signed-off-by: Frank Binns <frank.binns@imgtec.com> Reviewed-by: Luigi Santivetti <luigi.santivetti@imgtec.com> Reviewed-by: Emil Velikov <emil.velikov@collabora.com> Tested-by: Nicolas Cortes <nicolas.g.cortes@intel.com> Closes: https://gitlab.freedesktop.org/mesa/mesa/-/issues/3328 Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6105>
This commit is contained in:
parent
b9391c1d50
commit
d0e32e5f81
|
@ -1852,6 +1852,13 @@ dri2_make_current(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *dsurf,
|
|||
tmp_rsurf == old_rsurf);
|
||||
|
||||
_eglLog(_EGL_WARNING, "DRI2: failed to rebind the previous context");
|
||||
} else {
|
||||
/* dri2_dpy->core->bindContext succeeded, so take a reference on the
|
||||
* dri2_dpy. This prevents dri2_dpy from being reinitialized when a
|
||||
* EGLDisplay is terminated and then initialized again while a
|
||||
* context is still bound. See dri2_intitialize() for a more in depth
|
||||
* explanation. */
|
||||
dri2_dpy->ref_count++;
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1866,8 +1873,6 @@ dri2_make_current(_EGLDriver *drv, _EGLDisplay *disp, _EGLSurface *dsurf,
|
|||
if (egl_error != EGL_SUCCESS)
|
||||
return _eglError(egl_error, "eglMakeCurrent");
|
||||
|
||||
dri2_dpy->ref_count++;
|
||||
|
||||
if (dsurf && _eglSurfaceHasMutableRenderBuffer(dsurf) &&
|
||||
dri2_dpy->vtbl->set_shared_buffer_mode) {
|
||||
/* Always update the shared buffer mode. This is obviously needed when
|
||||
|
|
Loading…
Reference in New Issue