1 files changed, 6 insertions, 11 deletions
diff --git a/src/egl/main/eglglobals.h b/src/egl/main/eglglobals.h
index a9443cfbdd8..1e2c6742630 100644
--- a/src/egl/main/eglglobals.h
+++ b/src/egl/main/eglglobals.h
@@ -4,6 +4,7 @@
 #include "egltypedefs.h"
 #include "eglhash.h"
 #include "eglcurrent.h"
+#include "eglmutex.h"
 
 
 /**
@@ -11,12 +12,7 @@
  */
 struct _egl_global
 {
-   EGLBoolean Initialized;
-
-   /* these are private to egldisplay.c */
-   _EGLHashtable *Displays;
-   _EGLHashtable *Surfaces;
-
+   _EGLMutex *Mutex;
    EGLScreenMESA FreeScreenHandle;
 
    /* bitmaks of supported APIs (supported by _some_ driver) */
@@ -26,6 +22,9 @@ struct _egl_global
 
    EGLint NumDrivers;
    _EGLDriver *Drivers[10];
+
+   EGLint NumAtExitCalls;
+   void (*AtExitCalls[10])(void);
 };
 
 
@@ -33,11 +32,7 @@ extern struct _egl_global _eglGlobal;
 
 
 extern void
-_eglInitGlobals(void);
-
-
-extern void
-_eglDestroyGlobals(void);
+_eglAddAtExitCall(void (*func)(void));
 
 
 #endif /* EGLGLOBALS_INCLUDED */