Merge branch 'mesa_7_5_branch' into mesa_7_6_branch

[mesa.git] / src / egl / main / eglglobals.c

diff --git a/src/egl/main/eglglobals.c b/src/egl/main/eglglobals.c
index 102e55062064d443d2300157515e9aaa8d0d5585..3ae4c1ad3a3223a5814ab2f2a77159359319166e 100644 (file)
--- a/src/egl/main/eglglobals.c
+++ b/src/egl/main/eglglobals.c
@@ -1,51 +1,56 @@
-#include <stdio.h>
+#include <stdlib.h>
+#include <assert.h>
 #include "eglglobals.h"
+#include "egldriver.h"
+#include "egllog.h"
+#include "eglmutex.h"
 
 
-struct _egl_global _eglGlobal = { EGL_FALSE };
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof((a)[0]))
 
 
-/**
- * Init the fields in the _eglGlobal struct
- * May be safely called more than once.
- */
-void
-_eglInitGlobals(void)
+static _EGL_DECLARE_MUTEX(_eglGlobalMutex);
+struct _egl_global _eglGlobal =
 {
-   if (!_eglGlobal.Initialized) {
-      _eglGlobal.Displays = _eglNewHashTable();
-      _eglGlobal.Contexts = _eglNewHashTable();
-      _eglGlobal.Surfaces = _eglNewHashTable();
-      _eglGlobal.CurrentContext = EGL_NO_CONTEXT;
-      _eglGlobal.LastError = EGL_SUCCESS;
-      _eglGlobal.Initialized = EGL_TRUE;
-   }
+   &_eglGlobalMutex,       /* Mutex */
+   NULL,                   /* DisplayList */
+   1,                      /* FreeScreenHandle */
+   0x0,                    /* ClientAPIsMask */
+   0,                      /* NumDrivers */
+   { NULL },               /* Drivers */
+   2,                      /* NumAtExitCalls */
+   {                       /* AtExitCalls */
+      _eglFiniDisplay,
+      _eglUnloadDrivers
+   },
+};
+
+
+static void
+_eglAtExit(void)
+{
+   EGLint i;
+   for (i = _eglGlobal.NumAtExitCalls - 1; i >= 0; i--)
+      _eglGlobal.AtExitCalls[i]();
 }
 
 
-/**
- * Should call this via an atexit handler.
- */
 void
-_eglDestroyGlobals(void)
+_eglAddAtExitCall(void (*func)(void))
 {
-   /* XXX TODO walk over table entries, deleting each */
-   _eglDeleteHashTable(_eglGlobal.Displays);
-   _eglDeleteHashTable(_eglGlobal.Contexts);
-   _eglDeleteHashTable(_eglGlobal.Surfaces);
-}
+   if (func) {
+      static EGLBoolean registered = EGL_FALSE;
 
+      _eglLockMutex(_eglGlobal.Mutex);
 
+      if (!registered) {
+         atexit(_eglAtExit);
+         registered = EGL_TRUE;
+      }
 
-/**
- * Record EGL error code.
- */
-void
-_eglError(EGLint errCode, const char *msg)
-{
-   if (_eglGlobal.LastError == EGL_SUCCESS) {
-      _eglGlobal.LastError = errCode;
-      /* XXX temporary */
-      fprintf(stderr, "EGL Error 0x%x in %s\n", errCode, msg);
+      assert(_eglGlobal.NumAtExitCalls < ARRAY_SIZE(_eglGlobal.AtExitCalls));
+      _eglGlobal.AtExitCalls[_eglGlobal.NumAtExitCalls++] = func;
+
+      _eglUnlockMutex(_eglGlobal.Mutex);
    }
 }