EGLDisplay dpy;
EGLConfig config;
EGLContext ctx;
+ bool zombie;
egl_surface_t(EGLDisplay dpy, EGLConfig config, int32_t depthFormat);
virtual ~egl_surface_t();
egl_surface_t::egl_surface_t(EGLDisplay dpy,
EGLConfig config,
int32_t depthFormat)
- : magic(MAGIC), dpy(dpy), config(config), ctx(0)
+ : magic(MAGIC), dpy(dpy), config(config), ctx(0), zombie(false)
{
depth.version = sizeof(GGLSurface);
depth.data = 0;
if (surface->dpy != dpy)
return setError(EGL_BAD_DISPLAY, EGL_FALSE);
if (surface->ctx) {
- // FIXME: this surface is current check what the spec says
+ // defer disconnect/delete until no longer current
+ surface->zombie = true;
+ } else {
surface->disconnect();
- surface->ctx = 0;
+ delete surface;
}
- delete surface;
}
return EGL_TRUE;
}
if (c->draw) {
egl_surface_t* s = reinterpret_cast<egl_surface_t*>(c->draw);
s->disconnect();
+ s->ctx = EGL_NO_CONTEXT;
+ if (s->zombie)
+ delete s;
}
if (c->read) {
// FIXME: unlock/disconnect the read surface too
egl_surface_t* r = (egl_surface_t*)c->read;
if (d) {
c->draw = 0;
- d->ctx = EGL_NO_CONTEXT;
d->disconnect();
+ d->ctx = EGL_NO_CONTEXT;
+ if (d->zombie)
+ delete d;
}
if (r) {
c->read = 0;