3 files changed, 7 insertions, 8 deletions
diff --git a/src/egl/main/eglapi.c b/src/egl/main/eglapi.c
index a23b571..29617b7 100644
--- a/src/egl/main/eglapi.c
+++ b/src/egl/main/eglapi.c
@@ -122,7 +122,7 @@ eglTerminate(EGLDisplay dpy)
 
    drv = disp->Driver;
    if (drv) {
-      /* TODO drv->API.Terminate should be called here */
+      drv->API.Terminate(drv, disp);
       _eglCloseDriver(drv, disp);
       disp->Driver = NULL;
    }
diff --git a/src/egl/main/egldisplay.c b/src/egl/main/egldisplay.c
index ba7e634..0693f25 100644
--- a/src/egl/main/egldisplay.c
+++ b/src/egl/main/egldisplay.c
@@ -40,7 +40,6 @@ _eglFiniDisplay(void)
          if (dpy->ContextList || dpy->SurfaceList)
             _eglLog(_EGL_DEBUG, "Display %u is destroyed with resources", key);
 
-         _eglCleanupDisplay(dpy);
          free(dpy);
 
          key = _eglHashNextEntry(_eglDisplayHash, key);
@@ -237,11 +236,13 @@ _eglCleanupDisplay(_EGLDisplay *disp)
 {
    EGLint i;
 
-   for (i = 0; i < disp->NumConfigs; i++) {
-      free(disp->Configs[i]);
+   if (disp->Configs) {
+      for (i = 0; i < disp->NumConfigs; i++)
+         free(disp->Configs[i]);
+      free(disp->Configs);
+      disp->Configs = NULL;
+      disp->NumConfigs = 0;
    }
-   free(disp->Configs);
-   disp->Configs = NULL;
 
    /* XXX incomplete */
 }
diff --git a/src/egl/main/egldriver.c b/src/egl/main/egldriver.c
index 0e6b294..a252a9a 100644
--- a/src/egl/main/egldriver.c
+++ b/src/egl/main/egldriver.c
@@ -359,8 +359,6 @@ _eglOpenDriver(_EGLDisplay *dpy)
 EGLBoolean
 _eglCloseDriver(_EGLDriver *drv, _EGLDisplay *dpy)
 {
-   _eglReleaseDisplayResources(drv, dpy);
-   drv->API.Terminate(drv, dpy);
    return EGL_TRUE;
 }